solenv/bin/patch_tool.pl | 28 ++++++++++++++++------------
vcl/aqua/source/gdi/salgdi.cxx | 6 +++---
vcl/aqua/source/gdi/salprn.cxx | 2 +-
vcl/aqua/source/window/salframe.cxx | 4 ++--
vcl/inc/aqua/salframe.h | 2 +-
vcl/inc/aqua/salgdi.h | 2 +-
vcl/inc/os2/salgdi.h | 2 +-
vcl/inc/win/salgdi.h | 2 +-
vcl/os2/source/gdi/salgdi.cxx | 9 ++++++---
vcl/unx/generic/gdi/salgdi3.cxx | 6 ++----
vcl/win/source/gdi/salgdi.cxx | 2 +-
11 files changed, 35 insertions(+), 30 deletions(-)
New commits:
commit 1d5583df9bdad2b61f05dd504b30944851fe64a7
Author: Andre Fischer <a...@apache.org>
Date: Tue Dec 17 15:47:29 2013 +0000
123531: Create log path before using it.
diff --git a/solenv/bin/patch_tool.pl b/solenv/bin/patch_tool.pl
index c82806c..f7cc82d 100644
--- a/solenv/bin/patch_tool.pl
+++ b/solenv/bin/patch_tool.pl
@@ -2203,9 +2203,9 @@ sub UpdateReleasesXML($$)
sub main ()
{
my $context = ProcessCommandline();
- installer::logger::starttime();
- $installer::logger::Global->add_timestamp("starting logging");
-# installer::logger::SetupSimpleLogging(undef);
+# installer::logger::starttime();
+# $installer::logger::Global->add_timestamp("starting logging");
+ installer::logger::SetupSimpleLogging(undef);
die "ERROR: list file is not defined, please use --lst-file option"
unless defined $context->{'lst-file'};
@@ -2222,15 +2222,19 @@ sub main ()
if ($context->{'command'} =~ /create|check/)
{
- $installer::logger::Lang->set_filename(
- File::Spec->catfile(
- $context->{'output-path'},
- $context->{'product-name'},
- "msp",
- $context->{'source-version-dash'} . "_" .
$context->{'target-version-dash'},
- $context->{'language'},
- "log",
- "patch-creation.log"));
+ my $filename = File::Spec->catfile(
+ $context->{'output-path'},
+ $context->{'product-name'},
+ "msp",
+ $context->{'source-version-dash'} . "_" .
$context->{'target-version-dash'},
+ $context->{'language'},
+ "log",
+ "patch-creation.log");
+ my $dirname = dirname($filename);
+ File::Path::make_path($dirname) unless -d $dirname;
+ printf("directing output to $filename\n");
+
+ $installer::logger::Lang->set_filename($filename);
$installer::logger::Lang->copy_lines_from($installer::logger::Global);
$installer::logger::Lang->set_forward(undef);
$installer::logger::Info->set_forward($installer::logger::Lang);
commit 8a7cfd2bded9a531a034222c71ba3eda9df7d436
Author: Herbert Dürr <h...@apache.org>
Date: Tue Dec 17 15:01:25 2013 +0000
#i123840# normalize SalFrame resolution type to sal_Int32
diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index a45ae9f..76f13a6 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -430,13 +430,13 @@ void AquaSalGraphics::initResolution( NSWindow* )
mfFakeDPIScale = 1.0;
}
-void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void AquaSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
if( !mnRealDPIY )
initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
- rDPIX = static_cast<long>(mfFakeDPIScale * mnRealDPIX);
- rDPIY = static_cast<long>(mfFakeDPIScale * mnRealDPIY);
+ rDPIX = lrint( mfFakeDPIScale * mnRealDPIX);
+ rDPIY = lrint( mfFakeDPIScale * mnRealDPIY);
}
void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index 0a652c6..6bb3a057 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -407,7 +407,7 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
{
if( mpPrintInfo )
{
- long nDPIX = 72, nDPIY = 72;
+ sal_Int32 nDPIX = 72, nDPIY = 72;
mpGraphics->GetResolution( nDPIX, nDPIY );
const double fXScaling = static_cast<double>(nDPIX)/72.0,
fYScaling = static_cast<double>(nDPIY)/72.0;
diff --git a/vcl/aqua/source/window/salframe.cxx
b/vcl/aqua/source/window/salframe.cxx
index 63c0447..715a6fd 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -1219,7 +1219,7 @@ static Font getFont( NSFont* pFont, long nDPIY, const
Font& rDefault )
return aResult;
}
-void AquaSalFrame::getResolution( long& o_rDPIX, long& o_rDPIY )
+void AquaSalFrame::getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY )
{
if( ! mpGraphics )
{
@@ -1264,7 +1264,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings
)
// get the system font settings
Font aAppFont = aStyleSettings.GetAppFont();
- long nDPIX = 72, nDPIY = 72;
+ sal_Int32 nDPIX = 72, nDPIY = 72;
getResolution( nDPIX, nDPIY );
aAppFont = getFont( [NSFont systemFontOfSize: 0], nDPIY, aAppFont );
diff --git a/vcl/inc/aqua/salframe.h b/vcl/inc/aqua/salframe.h
index 52f4933..5a28484 100644
--- a/vcl/inc/aqua/salframe.h
+++ b/vcl/inc/aqua/salframe.h
@@ -179,7 +179,7 @@ public:
NSView* getNSView() const { return mpNSView; }
unsigned int getStyleMask() const { return mnStyleMask; }
- void getResolution( long& o_rDPIX, long& o_rDPIY );
+ void getResolution( sal_Int32& o_rDPIX, sal_Int32& o_rDPIY );
// actually the follwing methods do the same thing: flipping y coordinates
// but having two of them makes clearer what the coordinate system
diff --git a/vcl/inc/aqua/salgdi.h b/vcl/inc/aqua/salgdi.h
index 6182f59..12cda89 100644
--- a/vcl/inc/aqua/salgdi.h
+++ b/vcl/inc/aqua/salgdi.h
@@ -248,7 +248,7 @@ public:
Rectangle
&rNativeBoundingRegion, Rectangle &rNativeContentRegion );
// get device resolution
- virtual void GetResolution( long& rDPIX, long& rDPIY );
+ virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY
);
// get the depth of the device
virtual sal_uInt16 GetBitCount();
// get the width of the device
diff --git a/vcl/inc/os2/salgdi.h b/vcl/inc/os2/salgdi.h
index 532160b..a910971 100644
--- a/vcl/inc/os2/salgdi.h
+++ b/vcl/inc/os2/salgdi.h
@@ -233,7 +233,7 @@ public:
// public SalGraphics methods, the interface to teh independent vcl part
// get device resolution
- virtual void GetResolution( long& rDPIX, long& rDPIY );
+ virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY
);
// get the depth of the device
virtual USHORT GetBitCount();
// get the width of the device
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index a1bc265..fb779da 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -263,7 +263,7 @@ public:
// public SalGraphics methods, the interface to teh independent vcl part
// get device resolution
- virtual void GetResolution( long& rDPIX, long& rDPIY );
+ virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY
);
// get the depth of the device
virtual sal_uInt16 GetBitCount();
// get the width of the device
diff --git a/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx
index 9bb5409..3b759b0 100644
--- a/vcl/os2/source/gdi/salgdi.cxx
+++ b/vcl/os2/source/gdi/salgdi.cxx
@@ -151,13 +151,16 @@ static SalColor ImplGetROPSalColor( SalROPColor nROPColor
)
// -----------------------------------------------------------------------
-void Os2SalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void Os2SalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
// since OOo asks for DPI, I will query FONT_RES, which seems to be
// more correct than _RESOLUTION fields (on my wide screen lcd)
// and does not require conversion
- DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &rDPIX );
- DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &rDPIY );
+ long nDPIX = 72, nDPIY = 72;
+ DevQueryCaps( mhDC, CAPS_HORIZONTAL_FONT_RES, 1, &nDPIX );
+ DevQueryCaps( mhDC, CAPS_VERTICAL_FONT_RES, 1, &nDPIY );
+ rDPIX = nDPIX;
+ rDPIY = nDPIY;
}
// -----------------------------------------------------------------------
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index ccb31bc..a52e026 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -1279,10 +1279,8 @@ SalLayout* X11SalGraphics::GetTextLayout(
ImplLayoutArgs& rArgs, int nFallbackLe
if (!bDisableGraphite_ &&
GraphiteFontAdaptor::IsGraphiteEnabledFont(*mpServerFont[nFallbackLevel]))
{
- sal_Int32 xdpi, ydpi;
-
- xdpi = GetDisplay()->GetResolution().A();
- ydpi = GetDisplay()->GetResolution().B();
+ sal_Int32 xdpi = GetDisplay()->GetResolution().A();
+ sal_Int32 ydpi = GetDisplay()->GetResolution().B();
GraphiteFontAdaptor * pGrfont = new GraphiteFontAdaptor(
*mpServerFont[nFallbackLevel], xdpi, ydpi);
if (!pGrfont) return NULL;
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index d5e981c..412b614 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -791,7 +791,7 @@ WinSalGraphics::~WinSalGraphics()
// -----------------------------------------------------------------------
-void WinSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
+void WinSalGraphics::GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY )
{
rDPIX = GetDeviceCaps( getHDC(), LOGPIXELSX );
rDPIY = GetDeviceCaps( getHDC(), LOGPIXELSY );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
