[Libreoffice-commits] .: 2 commits - binfilter/inc

[Caolán McNamara]

 binfilter/inc/bf_svx/unoipset.hxx |    2 +-
 binfilter/inc/bf_sw/docary.hxx    |   10 +++++-----
 binfilter/inc/bf_tools/string.hxx |   15 +++++++--------
 3 files changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 829fc92ccf918b81f6f6a1fa60aa7c5ac07bc172
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 13 12:57:48 2012 +0000

    reduce warnings spew

diff --git a/binfilter/inc/bf_svx/unoipset.hxx b/binfilter/inc/bf_svx/unoipset.hxx
index aec50b2..1ec41d6 100644
--- a/binfilter/inc/bf_svx/unoipset.hxx
+++ b/binfilter/inc/bf_svx/unoipset.hxx
@@ -34,8 +34,8 @@
 
 namespace binfilter {
 struct SfxItemPropertyMap;
+struct SvxIDPropertyCombine;
 class SfxItemSet;
-class SvxIDPropertyCombine;
 class SdrItemPool;
 
 typedef ::std::vector< SvxIDPropertyCombine* > SvxIDPropertyCombineList;
diff --git a/binfilter/inc/bf_sw/docary.hxx b/binfilter/inc/bf_sw/docary.hxx
index 2721aa7..2871e61 100644
--- a/binfilter/inc/bf_sw/docary.hxx
+++ b/binfilter/inc/bf_sw/docary.hxx
@@ -110,11 +110,11 @@ public:
     // Mit dem Lookahead kann die Suche eingeschraenkt werden. 0 oder
     // USHRT_MAX suchen im gesamten Array.
 
-    _SwRedlineTbl::Count;
-    _SwRedlineTbl::operator[];
-    _SwRedlineTbl::GetObject;
-    _SwRedlineTbl::Seek_Entry;
-    _SwRedlineTbl::GetPos;
+    using _SwRedlineTbl::Count;
+    using _SwRedlineTbl::operator[];
+    using _SwRedlineTbl::GetObject;
+    using _SwRedlineTbl::Seek_Entry;
+    using _SwRedlineTbl::GetPos;
 };
 
 typedef SwUnoCrsr* SwUnoCrsrPtr;
commit 6fd3480b596c232ad14afb9013f64e2f275ea55b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 13 12:57:35 2012 +0000

    fix windows build

diff --git a/binfilter/inc/bf_tools/string.hxx b/binfilter/inc/bf_tools/string.hxx
index cb28021..0b4c00e 100644
--- a/binfilter/inc/bf_tools/string.hxx
+++ b/binfilter/inc/bf_tools/string.hxx
@@ -35,7 +35,6 @@
 #include <rtl/textcvt.h>
 #include <rtl/string.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/toolsdllapi.h>
 #include <tools/string.hxx>
 
 // -----------
@@ -107,15 +106,15 @@ typedef struct _ByteStringData
 // - ByteString -
 // --------------
 
-class TOOLS_DLLPUBLIC ByteString
+class ByteString
 {
     friend              class UniString;
 
 private:
     ByteStringData*     mpData;
 
-    TOOLS_DLLPRIVATE inline void ImplCopyData();
-    TOOLS_DLLPRIVATE inline char * ImplCopyStringData(char *);
+    inline void ImplCopyData();
+    inline char * ImplCopyStringData(char *);
 
                         ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL )
                         ByteString(int); // not implemented; to detect misuses
@@ -350,15 +349,15 @@ typedef struct _UniStringData
 // - UniString -
 // -------------
 
-class TOOLS_DLLPUBLIC UniString
+class UniString
 {
     friend              class ByteString;
 
 private:
     UniStringData*      mpData;
 
-    TOOLS_DLLPRIVATE inline void ImplCopyData();
-    TOOLS_DLLPRIVATE inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
+    inline void ImplCopyData();
+    inline sal_Unicode * ImplCopyStringData(sal_Unicode *);
 
                         UniString( const int* pDummy );    // not implemented: to prevent UniString( NULL )
                         UniString(int); // not implemented; to detect misuses of
@@ -373,7 +372,7 @@ private:
                                           // of operator +=(sal_Unicode)
 
     //detect and reject use of RTL_CONSTASCII_STRINGPARAM instead of RTL_CONSTASCII_USTRINGPARAM
-    TOOLS_DLLPRIVATE UniString( const sal_Char*, sal_Int32 );
+    UniString( const sal_Char*, sal_Int32 );
 public:
                         UniString();
                         UniString( const UniString& rStr );