i18npool/inc/textconversion.hxx | 2 ++
sd/source/ui/dlg/RemoteDialog.cxx | 4 ++--
vcl/inc/ios/salgdicommon.hxx | 30 ++++++++++++++++--------------
vcl/inc/ios/salprn.h | 2 +-
4 files changed, 21 insertions(+), 17 deletions(-)
New commits:
commit ae5c574ac24ed8979dcf03da87cd14c078db2a07
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Jan 1 13:57:50 2013 +0200
WaE: private field 'mPreviouslyDiscoverable' is not used
Change-Id: Ib3f16646035fe29aa64608a17f1a3063f9ebde95
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx
b/sd/source/ui/dlg/RemoteDialog.cxx
index 4d8e755..b41db5e76 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -25,6 +25,8 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
mClientBox( this, NULL, SdResId( LB_SERVERS ) ),
mPreviouslyDiscoverable()
{
+ (void) mPreviouslyDiscoverable; // avoid warnings about unused member
+
#ifdef ENABLE_SDREMOTE
FreeResource();
@@ -47,8 +49,6 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
mButtonConnect.SetClickHdl( LINK( this, RemoteDialog, HandleConnectButton
) );
SetCloseHdl( LINK( this, RemoteDialog, CloseHdl ) );
mButtonCancel.SetClickHdl( LINK( this, RemoteDialog, CloseHdl ) );
-#else
- (void) mPreviouslyDiscoverable; // avoid warnings about unused member
#endif
}
commit a754161b51a10d01fe78b02c7213d3cf2b63fae5
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Jan 1 12:02:44 2013 +0200
WaE: duplicate 'const' declaration specifier
Change-Id: I70b12a4de7edd785f87e4de3f398e90bf54ca84f
diff --git a/vcl/inc/ios/salprn.h b/vcl/inc/ios/salprn.h
index 6ead371..c383af4 100644
--- a/vcl/inc/ios/salprn.h
+++ b/vcl/inc/ios/salprn.h
@@ -134,7 +134,7 @@ class IosSalPrinter : public SalPrinter
bool i_bDirect,
ImplJobSetup* i_pSetupData );
// implement pull model print system
- virtual sal_Bool StartJob( const const rtl::OUString*
pFileName,
+ virtual sal_Bool StartJob( const rtl::OUString*
pFileName,
const rtl::OUString& rJobName,
const rtl::OUString& rAppName,
ImplJobSetup* i_pSetupData,
commit 436d8669eae4d95976b6d29b04c2f180ebc1ea67
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Jan 1 11:59:46 2013 +0200
WaE: unused private field
The fields were not really unused but the compiler can't know that,
and it was done in a horribly hacky way anyway.
Same fix as sberg did for the corresponding MacOSX code. (Yeah, should
factor out the commonality. Not that I know whether the VCL code for
iOS will ever be used.)
Change-Id: I573073c3f5c15f0a40ed72c9d58578fc80f65b93
diff --git a/vcl/inc/ios/salgdicommon.hxx b/vcl/inc/ios/salgdicommon.hxx
index 5a73f37..c27ebef 100644
--- a/vcl/inc/ios/salgdicommon.hxx
+++ b/vcl/inc/ios/salgdicommon.hxx
@@ -26,26 +26,28 @@ class RGBAColor
public:
RGBAColor( SalColor );
RGBAColor( float fRed, float fGreen, float fBlue, float fAlpha );
//NOTUSEDYET
- const float* AsArray() const { return &m_fRed; }
- bool IsVisible() const { return m_fAlpha > 0; }
- void SetAlpha( float fAlpha ) { m_fAlpha = fAlpha; }
+ const CGFloat* AsArray() const { return m_fRGBA; }
+ bool IsVisible() const { return m_fRGBA[3] > 0; }
+ void SetAlpha( float fAlpha ) { m_fRGBA[3] = fAlpha; }
private:
- float m_fRed, m_fGreen, m_fBlue, m_fAlpha;
+ CGFloat m_fRGBA[4]; // red, green, blue, alpha
};
inline RGBAColor::RGBAColor( SalColor nSalColor )
-: m_fRed( SALCOLOR_RED(nSalColor) * (1.0/255))
-, m_fGreen( SALCOLOR_GREEN(nSalColor) * (1.0/255))
-, m_fBlue( SALCOLOR_BLUE(nSalColor) * (1.0/255))
-, m_fAlpha( 1.0 ) // opaque
-{}
+{
+ m_fRGBA[0] = SALCOLOR_RED(nSalColor) * (1.0/255);
+ m_fRGBA[1] = SALCOLOR_GREEN(nSalColor) * (1.0/255);
+ m_fRGBA[2] = SALCOLOR_BLUE(nSalColor) * (1.0/255);
+ m_fRGBA[3] = 1.0; // opaque
+}
inline RGBAColor::RGBAColor( float fRed, float fGreen, float fBlue, float
fAlpha )
-: m_fRed( fRed )
-, m_fGreen( fGreen )
-, m_fBlue( fBlue )
-, m_fAlpha( fAlpha )
-{}
+{
+ m_fRGBA[0] = fRed;
+ m_fRGBA[1] = fGreen;
+ m_fRGBA[2] = fBlue;
+ m_fRGBA[3] = fAlpha;
+}
class XorEmulation
{
commit 993c3bff0173f5c9f8941e6b036d3e57f4b68cf1
Author: Tor Lillqvist <t...@iki.fi>
Date: Tue Jan 1 11:39:50 2013 +0200
We don't use these when DISABLE_DYNLOADING
Change-Id: I3be187cf7e87697e37a6dafbcdf8d0a4b924639e
diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index a56f5d9..735b000 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.hxx
@@ -82,8 +82,10 @@ public:
throw( com::sun::star::uno::RuntimeException );
protected :
const sal_Char* implementationName;
+#ifndef DISABLE_DYNLOADING
oslModule hModule;
oslGenericFunction SAL_CALL getFunctionBySymbol(const sal_Char* func);
+#endif
};
// for Hangul2Hanja conversion
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
