[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_svtools binfilter/inc
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx |2 +-
binfilter/bf_svtools/source/config/svt_defaultoptions.cxx|4 ++--
binfilter/bf_svtools/source/config/svt_moduleoptions.cxx |4 ++--
binfilter/bf_svtools/source/config/svt_pathoptions.cxx |6 +++---
binfilter/bf_svtools/source/filter.vcl/filter/svt_filter.cxx |2 +-
binfilter/inc/bf_svtools/pathoptions.hxx |4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 48d44b8fa4d45754cf1f15f7bab20af20ff69985
Author: Julien Nabet
Date: Mon Apr 9 14:43:39 2012 +0200
s/pathes/paths
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
index 0fb4b7c..de0bbbe 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
+++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx
@@ -345,7 +345,7 @@ namespace SfxContainer_Impl
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ // Default pathes
+/*N*/ // Default paths
/*N*/ maLibraryPath = SvtPathOptions().GetBasicPath();
/*N*/ }
/*N*/
diff --git a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
index d8217ff..600fc16 100644
--- a/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_defaultoptions.cxx
@@ -215,7 +215,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR("Office
{
case ::com::sun::star::uno::TypeClass_STRING :
{
-// multi pathes
+// multi paths
if ( pValues[nProp] >>= aTempStr )
aFullPath = aPathOpt.SubstituteVariable( aTempStr
);
else
@@ -227,7 +227,7 @@ SvtDefaultOptions_Impl::SvtDefaultOptions_Impl() :
ConfigItem( ASCII_STR("Office
case ::com::sun::star::uno::TypeClass_SEQUENCE :
{
-// single pathes
+// single paths
aFullPath = OUString();
Sequence < OUString > aList;
if ( pValues[nProp] >>= aList )
diff --git a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
index 933d7e1..257d40f 100644
--- a/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_moduleoptions.cxx
@@ -146,7 +146,7 @@ struct FactoryInfo
//-
// returns list of properties, which has changed only!
-// We use given value of sNodeBase to build full qualified pathes ...
+// We use given value of sNodeBase to build full qualified paths ...
// Last sign of it must be "/". Beacuse we use it directly, without
any additional things!
css::uno::Sequence< css::beans::PropertyValue > getChangedProperties(
const ::rtl::OUString& sNodeBase )
{
@@ -744,7 +744,7 @@ sal_Bool SvtModuleOptions_Impl::ClassifyFactoryByName(
const ::rtl::OUString& sN
*//*-*/
void SvtModuleOptions_Impl::impl_Read( const css::uno::Sequence<
::rtl::OUString >& lFactories )
{
-// Expand every set node name in lFactories to full qualified pathes to
his properties
+// Expand every set node name in lFactories to full qualified paths to his
properties
// and get right values from configuration.
const css::uno::Sequence< ::rtl::OUString > lProperties =
impl_ExpandSetNames( lFactories );
const css::uno::Sequence< css::uno::Any > lValues = GetProperties(
lProperties );
diff --git a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
index d091052..aa3e187 100644
--- a/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
+++ b/binfilter/bf_svtools/source/config/svt_pathoptions.cxx
@@ -154,7 +154,7 @@ class SvtPathOptions_Impl
public:
SvtPathOptions_Impl();
-// get the pathes, not const because of using a mutex
+// get the paths, not const because of using a mutex
const String& GetPath( SvtPathOptions::Pathes );
const String& GetAddinPath() { return GetPath(
SvtPathOptions::PATH_ADDIN ); }
const String& GetAutoCorrectPath() { return GetPath(
SvtPathOptions::PATH_AUTOCORRECT ); }
@@ -182,7 +182,7 @@ class SvtPathOptions_Impl
const String& GetUIConfigPath() { return GetPath(
SvtPathOptions::PATH_UICONFIG ); }
const String& GetFingerprintPath() { return GetPath(
SvtPathOptions::PATH_FINGERPRINT ); }
-// set the
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx |3 --- 1 file changed, 3 deletions(-) New commits: commit 985da32129e1cacd3231cca2f60c5b3f4d9b0b2e Author: Stephan Bergmann Date: Fri Mar 16 16:40:41 2012 +0100 Some include clean up diff --git a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx index 1f4ff4a..c6ed362 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_appopen.cxx @@ -37,9 +37,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -99,7 +97,6 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; -using namespace ::com::sun::star::system; using namespace ::com::sun::star::task; using namespace ::cppu; ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2 binfilter/bf_so3 binfilter/inc
binfilter/bf_sfx2/source/doc/sfx2_interno.cxx |2 -
binfilter/bf_so3/source/data/pseudo.cxx | 23
binfilter/bf_so3/source/inplace/client.cxx|8
binfilter/bf_so3/source/inplace/embobj.cxx|6 ---
binfilter/bf_so3/source/inplace/ipclient.cxx |8
binfilter/bf_so3/source/inplace/ipobj.cxx |6 ---
binfilter/bf_so3/source/misc/iface.cxx| 17 -
binfilter/bf_so3/source/persist/persist.cxx | 49 --
binfilter/bf_so3/source/persist/svstor.cxx| 13 --
binfilter/inc/bf_so3/iface.hxx| 21 +++
10 files changed, 7 insertions(+), 146 deletions(-)
New commits:
commit 281bc6d11b637b0a99e98d80800c733018687955
Author: Thomas Arnhold
Date: Fri Feb 24 02:10:28 2012 +0100
remove SotFactory::TestInvariant()
diff --git a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
index d8e21a2..9b13fcd 100644
--- a/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
+++ b/binfilter/bf_sfx2/source/doc/sfx2_interno.cxx
@@ -50,8 +50,6 @@ namespace binfilter {
/*N*/ TYPEINIT1(SfxInPlaceObjectFactory,SvFactory);
/*N*/ SO2_IMPL_CLASS1(SfxInPlaceObject,SfxInPlaceObjectFactory,SvInPlaceObject,
/*N*/
SvGlobalName(0x3C8A87D0L,0x9B53,0x11d3,0x9E,0xCE,0x00,0x50,0x04,0xD7,0x6C,0x4E))
-/*?*/ void SfxInPlaceObject::TestMemberObjRef(){}
-/*?*/ void SfxInPlaceObject::TestMemberInvariant(){}
/*?*/ ::IUnknown* SfxInPlaceObject::GetMemberInterface( const SvGlobalName &
){ return 0L; }
/*N*/ SfxInPlaceObject::SfxInPlaceObject()
diff --git a/binfilter/bf_so3/source/data/pseudo.cxx
b/binfilter/bf_so3/source/data/pseudo.cxx
index 170220e..bd35cd2 100644
--- a/binfilter/bf_so3/source/data/pseudo.cxx
+++ b/binfilter/bf_so3/source/data/pseudo.cxx
@@ -155,29 +155,6 @@ SvPseudoObject::~SvPseudoObject()
}
//=
-#ifdef TEST_INVARIANT
-
-void SvPseudoObject::TestMemberObjRef()
-/* [Beschreibung]
-
-Siehe .
-*/
-{}
-
-//=
-
-void SvPseudoObject::TestMemberInvariant()
-/* [Beschreibung]
-
-Siehe .
-*/
-{}
-#endif
-
-
-
-
-//=
void SvPseudoObject::FillClass
(
SvGlobalName * pClassName, /* Der Typ der Klasse */
diff --git a/binfilter/bf_so3/source/inplace/client.cxx
b/binfilter/bf_so3/source/inplace/client.cxx
index 6866a16..5c4f930 100644
--- a/binfilter/bf_so3/source/inplace/client.cxx
+++ b/binfilter/bf_so3/source/inplace/client.cxx
@@ -243,14 +243,6 @@
SO2_IMPL_STANDARD_CLASS1_DLL(SvEmbeddedClient,SvEmbeddedClientFactory,SvObject,
return NULL;
}
-void SvEmbeddedClient::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvEmbeddedClient::TestMemberInvariant()
-{
-}
-#endif
-
/
|*SvEmbeddedClient::SvEmbeddedClient()
*/
diff --git a/binfilter/bf_so3/source/inplace/embobj.cxx
b/binfilter/bf_so3/source/inplace/embobj.cxx
index c6e7d33..ff7987d 100644
--- a/binfilter/bf_so3/source/inplace/embobj.cxx
+++ b/binfilter/bf_so3/source/inplace/embobj.cxx
@@ -198,12 +198,6 @@
SO2_IMPL_CLASS2_DLL(SvEmbeddedObject,SvFactory,SvPersist,SvPseudoObject,
return NULL;
}
-void SvEmbeddedObject::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvEmbeddedObject::TestMemberInvariant() {}
-#endif
-
/
|*SvEmbeddedObject::SvEmbeddedObject()
|*
diff --git a/binfilter/bf_so3/source/inplace/ipclient.cxx
b/binfilter/bf_so3/source/inplace/ipclient.cxx
index 0409e78..8ad223d 100644
--- a/binfilter/bf_so3/source/inplace/ipclient.cxx
+++ b/binfilter/bf_so3/source/inplace/ipclient.cxx
@@ -96,14 +96,6 @@ SvInPlaceClient::~SvInPlaceClient()
}
//=
-void SvInPlaceClient::TestMemberObjRef() {}
-
-//=
-#ifdef TEST_INVARIANT
-void SvInPlaceClient::TestMemberInvariant() {}
-#endif
-
-//=
BOOL SvInPlaceClient::CanInPlaceActivate() const
/* [Beschreibung]
diff --git a/binfilter/bf_so3/source/inplace/ipobj.cxx
b/binfilter/bf_so3/source/inplace/ipobj.cxx
index 21c0c74..3d8ef04 100644
--- a/binfilter/bf_so3/source/inplace/ipobj.cxx
+++ b/binfilter/bf_so3/source/inplace/ipobj.cxx
@@ -56,12 +56,6 @@
SO2_IMPL_STANDARD_CLASS1_DLL(SvInPlaceObject,SvInPlaceObjectFactory,SvEmbeddedOb
return NULL;
}
-void SvInPlaceObject::TestMemberObjRef() {}
-
-#ifdef TEST_INVARIANT
-void SvInPlaceObject::TestMemberInvariant() {}
-#endif
-
/
|*S
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit f8506ca12e5cd35126ea419c7b7bb26d0920c4b4 Author: Stephan Bergmann Date: Wed Feb 22 19:50:32 2012 +0100 Adapt to new rtl::OUString ctor diff --git a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx index 938212d..0fb4b7c 100644 --- a/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx +++ b/binfilter/bf_sfx2/source/appl/sfx2_namecont.cxx @@ -621,8 +621,8 @@ namespace SfxContainer_Impl /*N*/ INetURLObject aUserBasic60InetObj_1( aUserBasicInetObj ); /*N*/ aUserBasic60InetObj_1.removeSegment(); /*N*/ INetURLObject aUserBasic60InetObj_2 = aUserBasic60InetObj_1; -/*N*/ aUserBasic60InetObj_1.Append( str60FolderName_1 ); -/*N*/ aUserBasic60InetObj_2.Append( str60FolderName_2 ); +/*N*/ aUserBasic60InetObj_1.Append(rtl::OString(str60FolderName_1)); +/*N*/ aUserBasic60InetObj_2.Append(rtl::OString(str60FolderName_2)); /*N*/ /*N*/ INetURLObject aUserBasic60InetObj = aUserBasic60InetObj_1; /*N*/ String aFolder60 = aUserBasic60InetObj.GetMainURL( INetURLObject::NO_DECODE ); ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx | 10 --
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |6 --
2 files changed, 16 deletions(-)
New commits:
commit 6c61a9ba2e9f996dc8c94a7104be8f332bafddcb
Author: Marcel Metz
Date: Tue Jan 10 07:24:43 2012 +0100
Remove cruft in debug tools
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
index 9fcdce7..042eaa3 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_bitset.cxx
@@ -26,7 +26,6 @@
*
/
-#include
#ifdef _MSC_VER
#pragma hdrstop
#endif
@@ -42,7 +41,6 @@ namespace binfilter {
/*N*/ BitSet BitSet::operator<<( USHORT nOffset ) const
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // create a work-copy, return it if nothing to shift
/*N*/ BitSet aSet(*this);
/*N*/ if ( nOffset == 0 )
@@ -97,12 +95,10 @@ namespace binfilter {
/*N*/ void BitSet::CopyFrom( const BitSet& rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = rSet.nCount;
/*N*/ nBlocks = rSet.nBlocks;
/*N*/ if ( rSet.nBlocks )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ pBitmap = new ULONG[nBlocks];
/*N*/ memcpy( pBitmap, rSet.pBitmap, 4 * nBlocks );
/*N*/ }
@@ -116,7 +112,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nCount = 0;
/*N*/ nBlocks = 0;
/*N*/ pBitmap = 0;
@@ -128,7 +123,6 @@ namespace binfilter {
/*N*/ BitSet::BitSet( const BitSet& rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ CopyFrom(rOrig);
/*N*/ }
@@ -143,7 +137,6 @@ namespace binfilter {
/*N*/ BitSet::~BitSet()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pBitmap;
/*N*/ }
@@ -168,7 +161,6 @@ namespace binfilter {
/*N*/ BitSet& BitSet::operator-=(USHORT nBit)
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L << (nBit % 32);
/*N*/
@@ -190,7 +182,6 @@ namespace binfilter {
/*N*/ BitSet& BitSet::operator|=( const BitSet& rSet )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMax = Min(nBlocks, rSet.nBlocks);
/*N*/
/*N*/ // expand the bitmap
@@ -227,7 +218,6 @@ namespace binfilter {
/*N*/ BitSet& BitSet::operator|=( USHORT nBit )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nBlock = nBit / 32;
/*N*/ ULONG nBitVal = 1L << (nBit % 32);
/*N*/
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bb2a1e5..366d692 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -40,7 +40,6 @@ namespace binfilter {
/*N*/ nGrow( nGrowSize ? nGrowSize : 1 ),
/*N*/ nUnused( nInitSize )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ USHORT nMSCBug = nInitSize;
/*N*/
/*N*/ if ( nMSCBug > 0 )
@@ -53,7 +52,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::SfxPtrArr( const SfxPtrArr& rOrig )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ nUsed = rOrig.nUsed;
/*N*/ nGrow = rOrig.nGrow;
/*N*/ nUnused = rOrig.nUnused;
@@ -71,7 +69,6 @@ namespace binfilter {
/*N*/ SfxPtrArr::~SfxPtrArr()
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ delete [] pData;
/*N*/ }
@@ -79,7 +76,6 @@ namespace binfilter {
/*N*/ USHORT SfxPtrArr::Remove( USHORT nPos, USHORT nLen )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // nLen adjustieren, damit nicht ueber das Ende hinaus geloescht wird
/*N*/ nLen = Min( (USHORT)(nUsed-nPos), nLen );
/*N*/
@@ -133,7 +129,6 @@ namespace binfilter {
/*N*/ BOOL SfxPtrArr::Remove( void* aElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ // einfache Aufgaben ...
/*N*/ if ( nUsed == 0 )
/*N*/ return FALSE;
@@ -153,7 +148,6 @@ namespace binfilter {
/*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
/*N*/ {
-/*N*/ DBG_MEMTEST();
/*N*/ DBG_ASSERT( sal_Int32(nUsed+1) < sal_Int32( USHRT_MAX / sizeof(void*)
), "array too large" );
/*N*/ // musz das Array umkopiert werden?
/*N*/ if ( nUnused == 0 )
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: binfilter/bf_sfx2
binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2a1f2dc8b3e1d0a7fc468f6c25a18d7fc2baccee
Author: Stephan Bergmann
Date: Thu Sep 29 09:18:18 2011 +0200
Some more warning cleanup (Mac OS X).
diff --git a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
index bacb3f7..bb2a1e5 100644
--- a/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
+++ b/binfilter/bf_sfx2/source/bastyp/sfx2_minarray.cxx
@@ -154,7 +154,7 @@ namespace binfilter {
/*N*/ void SfxPtrArr::Insert( USHORT nPos, void* rElem )
/*N*/ {
/*N*/ DBG_MEMTEST();
-/*N*/ DBG_ASSERT( (nUsed+1) < ( USHRT_MAX / sizeof(void*) ), "array too
large" );
+/*N*/ DBG_ASSERT( sal_Int32(nUsed+1) < sal_Int32( USHRT_MAX / sizeof(void*)
), "array too large" );
/*N*/ // musz das Array umkopiert werden?
/*N*/ if ( nUnused == 0 )
/*N*/ {
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
