[Libreoffice-commits] .: sot/source
sot/source/sdstor/stgelem.cxx |6 --
sot/source/sdstor/stgelem.hxx |1 -
2 files changed, 7 deletions(-)
New commits:
commit c29d22ce5d1d8c35218a7bf9939863aa2e058aa7
Author: Laureano G. Linde
Date: Sun Apr 15 18:47:57 2012 +0200
Removed StgHeader::SetClassId(ClsId const &)
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index ff73a59..c51dc1b 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -187,12 +187,6 @@ void StgHeader::SetFATPage( short n, sal_Int32 nb )
}
}
-void StgHeader::SetClassId( const ClsId& r )
-{
-if( memcmp( &aClsId, &r, sizeof( ClsId ) ) )
-bDirty = sal_True, memcpy( &aClsId, &r, sizeof( ClsId ) );
-}
-
void StgHeader::SetTOCStart( sal_Int32 n )
{
if( n != nTOCstrm ) bDirty = sal_True, nTOCstrm = n;
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7792608..6ea349e 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -87,7 +87,6 @@ public:
void SetMasters( sal_Int32 n );
short GetFAT1Size() const { return 109; }
const ClsId& GetClassId() const { return aClsId;}
-void SetClassId( const ClsId& );
sal_Int32 GetFATPage( short ) const;
void SetFATPage( short, sal_Int32 );
};
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/sdstor/stgcache.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3af05d9da637c232a28ac7c5aa396c95118eee3b
Author: Stephan Bergmann
Date: Tue Jan 31 09:17:53 2012 +0100
SWAPLONG -> OSL_SWAPDWORD
diff --git a/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 48e0f7d..3d467df 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.cxx
@@ -91,7 +91,7 @@ void StgPage::SetPage( short nOff, sal_Int32 nVal )
if( ( nOff < (short) ( nData / sizeof( sal_Int32 ) ) ) && nOff >= 0 )
{
#ifdef OSL_BIGENDIAN
- nVal = SWAPLONG(nVal);
+ nVal = OSL_SWAPDWORD(nVal);
#endif
((sal_Int32*) pData )[ nOff ] = nVal;
bDirty = sal_True;
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/sdstor/stgcache.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 23e8cfdb903f515bbd80be83c670e3ff2334f61d Author: Stephan Bergmann Date: Tue Jan 31 08:45:46 2012 +0100 SWAPLONG -> OSL_SWAPDWORD diff --git a/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx index 1c0ad82..d545631 100644 --- a/sot/source/sdstor/stgcache.hxx +++ b/sot/source/sdstor/stgcache.hxx @@ -117,7 +117,7 @@ public: return -1; sal_Int32 n = ((sal_Int32*) pData )[ nOff ]; #ifdef OSL_BIGENDIAN -return SWAPLONG(n); +return OSL_SWAPDWORD(n); #else return n; #endif ___ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/base/formats.cxx |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 60beba6a73c46d4564599467badd6136f9523434
Author: Julien Nabet
Date: Sun Dec 11 22:30:46 2011 +0100
Revert buggy 4046a1dfc2ba5b52cab7083f4817351c647a59c3
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 1c5ec07..2bfa066 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,7 +1325,8 @@ rEntry
if( pFDesc->cItems )
{
-bRet = (4 < (pFDesc->fgd[ 0
].cFileName.size())) && sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii(
".URL" );
+ByteString sDesc( pFDesc->fgd[ 0
].cFileName );
+bRet = 4 < sDesc.Len() && sDesc.Copy(
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( ".URL" );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source
sot/source/base/formats.cxx |3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 4046a1dfc2ba5b52cab7083f4817351c647a59c3
Author: Julien Nabet
Date: Sun Dec 11 13:45:53 2011 +0100
Remove ByteString
diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 2bfa066..1c5ec07 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -1325,8 +1325,7 @@ rEntry
if( pFDesc->cItems )
{
-ByteString sDesc( pFDesc->fgd[ 0
].cFileName );
-bRet = 4 < sDesc.Len() && sDesc.Copy(
sDesc.Len()-4 ).EqualsIgnoreCaseAscii( ".URL" );
+bRet = (4 < (pFDesc->fgd[ 0
].cFileName.size())) && sDesc.Copy( sDesc.Len()-4 ).EqualsIgnoreCaseAscii(
".URL" );
}
}
}
___
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sot/source svl/source svtools/source unotools/inc unotools/source xmlsecurity/source
sot/source/sdstor/ucbstorage.cxx |1
svl/source/fsstor/fsstorage.cxx|1
svtools/source/contnr/templwin.cxx |7
svtools/source/control/inettbc.cxx |9
unotools/inc/unotools/ucbhelper.hxx| 91 -
unotools/source/ucbhelper/ucbhelper.cxx| 995 +
xmlsecurity/source/component/documentdigitalsignatures.cxx | 15
7 files changed, 465 insertions(+), 654 deletions(-)
New commits:
commit 2af9040d38af7c7353855415dbea0134585058f3
Author: Stephan Bergmann
Date: Mon Nov 28 10:09:57 2011 +0100
Cleaned up utl::UCBContentHelper.
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d0b3534..b6fb581 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index 7617563..4fbc780 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.cxx
@@ -29,6 +29,7 @@
#include
#include
#include
+#include
#include
#include
#include
diff --git a/svtools/source/contnr/templwin.cxx
b/svtools/source/contnr/templwin.cxx
index 00623c3..3792826 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -236,10 +236,9 @@ void ODocumentInfoPreview::fill(
// size
if ( i_rURL.Len() > 0 )
{
-sal_uLong nDocSize = ::utl::UCBContentHelper::GetSize( i_rURL );
m_pEditWin->InsertEntry(
m_pInfoTable->GetString( DI_SIZE ),
-CreateExactSizeText_Impl( nDocSize ) );
+CreateExactSizeText_Impl( utl::UCBContentHelper::GetSize( i_rURL )
) );
}
// MIMEType
@@ -749,8 +748,8 @@ sal_Bool SvtFileViewWindow_Impl::HasPreviousLevel( String&
rURL ) const
String SvtFileViewWindow_Impl::GetFolderTitle() const
{
-String aTitle;
-::utl::UCBContentHelper::GetTitle( aFolderURL, aTitle );
+rtl::OUString aTitle;
+::utl::UCBContentHelper::GetTitle( aFolderURL, &aTitle );
return aTitle;
}
diff --git a/svtools/source/control/inettbc.cxx
b/svtools/source/control/inettbc.cxx
index 9ed13a1..21547e3 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1200,7 +1200,7 @@ String SvtURLBox::GetURL()
Any aAny =
UCBContentHelper::GetProperty(aURL,aPropName);
sal_Bool success = (aAny >>= aFileURL);
-String aTitle;
+rtl::OUString aTitle;
if(success)
aTitle = String(
INetURLObject(aFileURL).getName(
@@ -1209,12 +1209,11 @@ String SvtURLBox::GetURL()
INetURLObject::DECODE_WITH_CHARSET ));
else
success =
-UCBContentHelper::GetTitle(aURL,aTitle);
+UCBContentHelper::GetTitle(aURL,&aTitle);
if( success &&
-( aTitle.Len() > 1 ||
- (aTitle.CompareToAscii("/") != 0 &&
- aTitle.CompareToAscii(".") != 0) ) )
+!(aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("/"))
+ || aTitle.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("."))) )
{
aObj.SetName( aTitle );
if ( bSlash )
diff --git a/unotools/inc/unotools/ucbhelper.hxx
b/unotools/inc/unotools/ucbhelper.hxx
index b0ed12a..358d8e1 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.hxx
@@ -25,55 +25,58 @@
* for a copy of the LGPLv3 License.
*
/
-#include "unotools/unotoolsdllapi.h"
#ifndef _UNOTOOLS_UCBHELPER_HXX
#define _UNOTOOLS_UCBHELPER_HXX
-// include ---
-#include
-#include
-#include
-#include
-
-#include
-
-namespace ucbhelper
-{
-class Content;
-}
-
-namespace utl
-{
-class UNOTOOLS_DLLPUBLIC UCBContentHelper
-{
-public:
-static sal_Bool IsDocument( const String& rContent );
-static sal_Bool IsFolder( const String& rContent );
-static sal_Bool GetTitle( const String& rContent, String&
rTitle );
-static sal_Bool Kill( const String& rContent );
-
-static ::com::sun::star::uno::Any GetProperty( const String& rURL,
const ::rtl::OUString& rName );
-
-static ::com::sun::star::uno::Sequence< ::rtl::OUString >
-GetFolderContents( const String& rFolder,
sal_Bool bFolder, sal_Bool bSorted = sal_False );
-
-static sal_Bool MakeFolder( const String& rFolder,
sal_Bool bNewOnly = sal_False );
-static sal_Bool
