summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathias Bauer <mba@openoffice.org>2009-10-21 10:47:51 +0200
committerMathias Bauer <mba@openoffice.org>2009-10-21 10:47:51 +0200
commitdbea801cbb1af5fb33b3627590cfad69800b50f2 (patch)
tree9ff9e35673e0c70a402c4027bcb07aa78371b7ce
parent03685ed53213d63c3126624e2a65954e60df4e14 (diff)
#i103496#: some warnings, pch and windows only fixes
-rwxr-xr-xcanvas/source/directx/dx_config.cxx3
-rw-r--r--canvas/source/directx/dx_config.hxx2
-rw-r--r--svl/source/items/itemprop.cxx14
-rw-r--r--svl/source/items/stylepool.cxx2
-rw-r--r--svtools/source/config/optionsdrawinglayer.cxx3
-rw-r--r--unotools/inc/unotools/fontdefs.hxx2
-rw-r--r--unotools/source/config/options.cxx2
-rw-r--r--unotools/source/config/regoptions.cxx1
8 files changed, 19 insertions, 10 deletions
diff --git a/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index 48f44e3ba816..e124d4d78e6a 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.cxx
@@ -144,6 +144,9 @@ namespace dxcanvas
}
}
+ void DXCanvasItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) {}
+ void DXCanvasItem::Commit() {}
+
bool DXCanvasItem::isDeviceUsable( const DeviceInfo& rDeviceInfo ) const
{
return maValues.find(rDeviceInfo) == maValues.end();
diff --git a/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 34deddb509a7..1fffcb2ed56e 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.hxx
@@ -77,6 +77,8 @@ namespace dxcanvas
bool isBlacklistCurrentDevice() const;
void blacklistDevice( const DeviceInfo& rDeviceInfo );
void adaptMaxTextureSize( basegfx::B2IVector& io_maxTextureSize ) const;
+ virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+ virtual void Commit();
private:
typedef std::set< DeviceInfo > ValueSet;
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index cd50c1c51794..3add3f466495 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -43,7 +43,7 @@ using namespace com::sun::star;
using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::uno;
-using namespace ::rtl;
+
/*-- 16.02.2009 10:03:55---------------------------------------------------
-----------------------------------------------------------------------*/
@@ -262,7 +262,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
/* -----------------------------06.06.01 12:32--------------------------------
---------------------------------------------------------------------------*/
-void SfxItemPropertySet::getPropertyValue( const OUString &rName,
+void SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
const SfxItemSet& rSet, Any& rAny ) const
throw(RuntimeException, UnknownPropertyException)
{
@@ -275,7 +275,7 @@ void SfxItemPropertySet::getPropertyValue( const OUString &rName,
/* -----------------------------21.02.00 11:26--------------------------------
---------------------------------------------------------------------------*/
-Any SfxItemPropertySet::getPropertyValue( const OUString &rName,
+Any SfxItemPropertySet::getPropertyValue( const rtl::OUString &rName,
const SfxItemSet& rSet ) const
throw(RuntimeException, UnknownPropertyException)
{
@@ -327,7 +327,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
/* -----------------------------21.02.00 11:26--------------------------------
---------------------------------------------------------------------------*/
-void SfxItemPropertySet::setPropertyValue( const OUString &rName,
+void SfxItemPropertySet::setPropertyValue( const rtl::OUString &rName,
const Any& aVal,
SfxItemSet& rSet ) const
throw(RuntimeException,
@@ -360,7 +360,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
return eRet;
}
PropertyState SfxItemPropertySet::getPropertyState(
- const OUString& rName, const SfxItemSet& rSet) const
+ const rtl::OUString& rName, const SfxItemSet& rSet) const
throw(UnknownPropertyException)
{
PropertyState eRet = PropertyState_DIRECT_VALUE;
@@ -489,7 +489,7 @@ Sequence< Property > SAL_CALL
---------------------------------------------------------------------------*/
Property SAL_CALL
- SfxExtItemPropertySetInfo::getPropertyByName( const OUString& rPropertyName )
+SfxExtItemPropertySetInfo::getPropertyByName( const rtl::OUString& rPropertyName )
throw(UnknownPropertyException, RuntimeException)
{
return aExtMap.getPropertyByName( rPropertyName );
@@ -498,7 +498,7 @@ Property SAL_CALL
---------------------------------------------------------------------------*/
sal_Bool SAL_CALL
- SfxExtItemPropertySetInfo::hasPropertyByName( const OUString& rPropertyName )
+SfxExtItemPropertySetInfo::hasPropertyByName( const rtl::OUString& rPropertyName )
throw(RuntimeException)
{
return aExtMap.hasPropertyByName( rPropertyName );
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 57ba991afcb4..6d214b6b94dd 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -27,6 +27,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svl.hxx"
#ifdef _MSC_VER
#pragma hdrstop
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index d4aeda6e6be8..43490c5ea79e 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.cxx
@@ -27,6 +27,9 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
#ifdef _MSC_VER
#pragma hdrstop
#endif
diff --git a/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
index e595fe45400d..ef4f68bb9e8a 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.hxx
@@ -33,7 +33,7 @@
namespace utl {
class FontSubstConfiguration;
- class FontNameAttr;
+ struct FontNameAttr;
}
// ----------------
diff --git a/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
index 5bd2ed46f7ec..3b41d14bdd6c 100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.cxx
@@ -101,7 +101,7 @@ Options::~Options()
{
}
-void Options::ConfigurationChanged( ConfigurationBroadcaster* p, sal_uInt32 nHint )
+void Options::ConfigurationChanged( ConfigurationBroadcaster*, sal_uInt32 nHint )
{
NotifyListeners( nHint );
}
diff --git a/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index 9b1017785bd7..b0f41602da2e 100644
--- a/unotools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.cxx
@@ -43,7 +43,6 @@ namespace utl
{
//........................................................................
- using namespace ::utl;
using namespace ::com::sun::star::uno;
//====================================================================