Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
c6f32df9
Kaydet (Commit)
c6f32df9
authored
Şub 05, 2017
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_uIntPtr to sal_uInt16
Change-Id: If463ae457f53a0a8b12cc0748afbc654f54ae3c3
üst
eb0b727b
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
21 additions
and
21 deletions
+21
-21
page.cxx
cui/source/tabpages/page.cxx
+1
-1
styleuno.cxx
sc/source/ui/unoobj/styleuno.cxx
+1
-1
printhelper.cxx
sfx2/source/doc/printhelper.cxx
+1
-1
vclxprinter.cxx
toolkit/source/awt/vclxprinter.cxx
+1
-1
salprn.h
vcl/inc/osx/salprn.h
+2
-2
salprn.hxx
vcl/inc/salprn.hxx
+2
-2
genprn.h
vcl/inc/unx/genprn.h
+2
-2
salprn.h
vcl/inc/win/salprn.h
+2
-2
salprn.cxx
vcl/osx/salprn.cxx
+2
-2
print.cxx
vcl/source/gdi/print.cxx
+1
-1
print3.cxx
vcl/source/gdi/print3.cxx
+1
-1
genprnpsp.cxx
vcl/unx/generic/print/genprnpsp.cxx
+3
-3
salprn.cxx
vcl/win/gdi/salprn.cxx
+2
-2
No files found.
cui/source/tabpages/page.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -928,7 +928,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, Control&, void)
m_pPaperTrayBox
->
SetEntryData
(
nEntryPos
,
reinterpret_cast
<
void
*>
((
sal_uLong
)
PAPERBIN_PRINTER_SETTINGS
)
);
OUString
aPaperBin
(
EditResId
(
RID_SVXSTR_PAPERBIN
)
);
sal_uInt16
nBinCount
=
mpDefPrinter
->
GetPaperBinCount
();
const
sal_uInt16
nBinCount
=
mpDefPrinter
->
GetPaperBinCount
();
for
(
sal_uInt16
i
=
0
;
i
<
nBinCount
;
++
i
)
{
...
...
sc/source/ui/unoobj/styleuno.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -1655,7 +1655,7 @@ void ScStyleObj::setPropertyValue_Impl( const OUString& rPropertyName, const Sfx
Printer
*
pPrinter
=
pDocShell
->
GetPrinter
();
if
(
pPrinter
)
{
sal_uInt16
nCount
=
pPrinter
->
GetPaperBinCount
();
const
sal_uInt16
nCount
=
pPrinter
->
GetPaperBinCount
();
for
(
sal_uInt16
i
=
0
;
i
<
nCount
;
i
++
)
if
(
aName
==
pPrinter
->
GetPaperBinName
(
i
)
)
{
...
...
sfx2/source/doc/printhelper.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -416,7 +416,7 @@ void SfxPrintHelper::impl_setPrinter(const uno::Sequence< beans::PropertyValue >
OUString
aTmp
;
if
(
!
(
rProp
.
Value
>>=
aTmp
)
)
throw
css
::
lang
::
IllegalArgumentException
();
sal_uInt16
nCount
=
pPrinter
->
GetPaperBinCount
();
const
sal_uInt16
nCount
=
pPrinter
->
GetPaperBinCount
();
for
(
sal_uInt16
nBin
=
0
;
nBin
<
nCount
;
nBin
++
)
{
OUString
aName
(
pPrinter
->
GetPaperBinName
(
nBin
)
);
...
...
toolkit/source/awt/vclxprinter.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -211,7 +211,7 @@ css::uno::Sequence< OUString > VCLXPrinterPropertySet::getFormDescriptions( )
{
::
osl
::
MutexGuard
aGuard
(
Mutex
);
sal_uInt16
nPaperBinCount
=
GetPrinter
()
->
GetPaperBinCount
();
const
sal_uInt16
nPaperBinCount
=
GetPrinter
()
->
GetPaperBinCount
();
css
::
uno
::
Sequence
<
OUString
>
aDescriptions
(
nPaperBinCount
);
for
(
sal_uInt16
n
=
0
;
n
<
nPaperBinCount
;
n
++
)
{
...
...
vcl/inc/osx/salprn.h
Dosyayı görüntüle @
c6f32df9
...
...
@@ -76,8 +76,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
long
&
o_rPageOffX
,
long
&
o_rPageOffY
,
long
&
o_rPageWidth
,
long
&
o_rPageHeight
)
override
;
virtual
sal_uInt32
GetCapabilities
(
const
ImplJobSetup
*
i_pSetupData
,
PrinterCapType
i_nType
)
override
;
virtual
sal_u
Long
GetPaperBinCount
(
const
ImplJobSetup
*
i_pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
i_pSetupData
,
sal_u
Long
i_nPaperBin
)
override
;
virtual
sal_u
Int16
GetPaperBinCount
(
const
ImplJobSetup
*
i_pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
i_pSetupData
,
sal_u
Int16
i_nPaperBin
)
override
;
virtual
void
InitPaperFormats
(
const
ImplJobSetup
*
i_pSetupData
)
override
;
virtual
int
GetLandscapeAngle
(
const
ImplJobSetup
*
i_pSetupData
)
override
;
...
...
vcl/inc/salprn.hxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -75,8 +75,8 @@ public:
long
&
rPageOffX
,
long
&
rPageOffY
,
long
&
rPageWidth
,
long
&
rPageHeight
)
=
0
;
virtual
sal_uInt32
GetCapabilities
(
const
ImplJobSetup
*
pSetupData
,
PrinterCapType
nType
)
=
0
;
virtual
sal_u
Long
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
=
0
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_u
Long
nPaperBin
)
=
0
;
virtual
sal_u
Int16
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
=
0
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_u
Int16
nPaperBin
)
=
0
;
// fills m_aPaperFormats and sets m_bPapersInit to true
virtual
void
InitPaperFormats
(
const
ImplJobSetup
*
pSetupData
)
=
0
;
// returns angle that a landscape page will be turned counterclockwise wrt to portrait
...
...
vcl/inc/unx/genprn.h
Dosyayı görüntüle @
c6f32df9
...
...
@@ -48,8 +48,8 @@ public:
long
&
rPageOffX
,
long
&
rPageOffY
,
long
&
rPageWidth
,
long
&
rPageHeight
)
override
;
virtual
sal_uInt32
GetCapabilities
(
const
ImplJobSetup
*
pSetupData
,
PrinterCapType
nType
)
override
;
virtual
sal_uInt
Ptr
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_uInt
Ptr
nPaperBin
)
override
;
virtual
sal_uInt
16
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_uInt
16
nPaperBin
)
override
;
virtual
void
InitPaperFormats
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
int
GetLandscapeAngle
(
const
ImplJobSetup
*
pSetupData
)
override
;
};
...
...
vcl/inc/win/salprn.h
Dosyayı görüntüle @
c6f32df9
...
...
@@ -63,8 +63,8 @@ public:
long
&
rPageOffX
,
long
&
rPageOffY
,
long
&
rPageWidth
,
long
&
rPageHeight
)
override
;
virtual
sal_uInt32
GetCapabilities
(
const
ImplJobSetup
*
pSetupData
,
PrinterCapType
nType
)
override
;
virtual
sal_uInt
Ptr
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_uInt
Ptr
nPaperBin
)
override
;
virtual
sal_uInt
16
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
OUString
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_uInt
16
nPaperBin
)
override
;
virtual
void
InitPaperFormats
(
const
ImplJobSetup
*
pSetupData
)
override
;
virtual
int
GetLandscapeAngle
(
const
ImplJobSetup
*
pSetupData
)
override
;
};
...
...
vcl/osx/salprn.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -259,12 +259,12 @@ bool AquaSalInfoPrinter::SetData( JobSetFlags i_nFlags, ImplJobSetup* io_pSetupD
return
mpPrintInfo
!=
nil
;
}
sal_u
Long
AquaSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
)
sal_u
Int16
AquaSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
)
{
return
0
;
}
OUString
AquaSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
,
sal_u
Long
)
OUString
AquaSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
,
sal_u
Int16
)
{
return
OUString
();
}
...
...
vcl/source/gdi/print.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -1596,7 +1596,7 @@ sal_uInt16 Printer::GetPaperBinCount() const
if
(
IsDisplayPrinter
()
)
return
0
;
return
(
sal_uInt16
)
mpInfoPrinter
->
GetPaperBinCount
(
&
maJobSetup
.
ImplGetConstData
()
);
return
mpInfoPrinter
->
GetPaperBinCount
(
&
maJobSetup
.
ImplGetConstData
()
);
}
OUString
Printer
::
GetPaperBinName
(
sal_uInt16
nPaperBin
)
const
...
...
vcl/source/gdi/print3.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -880,7 +880,7 @@ PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( cons
{
sal_Int32
nBin
=
-
1
;
i_rProps
[
nProperty
].
Value
>>=
nBin
;
if
(
nBin
>=
0
&&
nBin
<
mxPrinter
->
GetPaperBinCount
(
)
)
if
(
nBin
>=
0
&&
nBin
<
static_cast
<
sal_Int32
>
(
mxPrinter
->
GetPaperBinCount
()
)
)
nPaperBin
=
nBin
;
}
}
...
...
vcl/unx/generic/print/genprnpsp.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -741,7 +741,7 @@ void PspSalInfoPrinter::GetPageInfo(
}
}
sal_u
Long
PspSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
pJobSetup
)
sal_u
Int16
PspSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
pJobSetup
)
{
if
(
!
pJobSetup
)
return
0
;
...
...
@@ -753,7 +753,7 @@ sal_uLong PspSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pJobSetup )
return
pKey
?
pKey
->
countValues
()
:
0
;
}
OUString
PspSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
pJobSetup
,
sal_u
Long
nPaperBin
)
OUString
PspSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
pJobSetup
,
sal_u
Int16
nPaperBin
)
{
JobData
aData
;
JobData
::
constructFromStreamBuffer
(
pJobSetup
->
GetDriverData
(),
pJobSetup
->
GetDriverDataLen
(),
aData
);
...
...
@@ -762,7 +762,7 @@ OUString PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, sal_
if
(
aData
.
m_pParser
)
{
const
PPDKey
*
pKey
=
aData
.
m_pParser
?
aData
.
m_pParser
->
getKey
(
OUString
(
"InputSlot"
)
)
:
nullptr
;
if
(
!
pKey
||
nPaperBin
>=
(
sal_u
Long
)
pKey
->
countValues
()
)
if
(
!
pKey
||
nPaperBin
>=
(
sal_u
Int16
)
pKey
->
countValues
()
)
aRet
=
aData
.
m_pParser
->
getDefaultInputSlot
();
else
{
...
...
vcl/win/gdi/salprn.cxx
Dosyayı görüntüle @
c6f32df9
...
...
@@ -1207,7 +1207,7 @@ bool WinSalInfoPrinter::SetData( JobSetFlags nFlags, ImplJobSetup* pSetupData )
return
FALSE
;
}
sal_u
Long
WinSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
sal_u
Int16
WinSalInfoPrinter
::
GetPaperBinCount
(
const
ImplJobSetup
*
pSetupData
)
{
DWORD
nRet
=
ImplDeviceCaps
(
this
,
DC_BINS
,
nullptr
,
pSetupData
);
if
(
nRet
&&
(
nRet
!=
GDI_ERROR
)
)
...
...
@@ -1216,7 +1216,7 @@ sal_uLong WinSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* pSetupData )
return
0
;
}
OUString
WinSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_u
Long
nPaperBin
)
OUString
WinSalInfoPrinter
::
GetPaperBinName
(
const
ImplJobSetup
*
pSetupData
,
sal_u
Int16
nPaperBin
)
{
OUString
aPaperBinName
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment