[Libreoffice-commits] .: 40 commits - automation/source connectivity/inc connectivity/source dbaccess/source desktop/source editeng/inc editeng/source formula/inc formula/source framework/inc framework/source lotuswordpro/source Makefile.in sal/osl sal/qa sal/rtl sc/source svl/inc svl/source svtools/inc svtools/qa svtools/source svx/inc svx/source sw/source tools/inc tools/source unotools/inc unotools/source unusedcode.easy xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Aug 8 05:05:17 PDT 2011
Makefile.in | 2
automation/source/inc/cmdbasestream.hxx | 1
automation/source/server/cmdbasestream.cxx | 10
automation/source/server/retstrm.hxx | 1
connectivity/inc/connectivity/sqlparse.hxx | 8
connectivity/source/parse/sqlbison.y | 6
dbaccess/source/ui/browser/unodatbr.cxx | 5
desktop/source/app/app.cxx | 13
desktop/source/migration/migration.cxx | 1
editeng/inc/editeng/AccessibleEditableTextPara.hxx | 3
editeng/inc/editeng/editobj.hxx | 1
editeng/source/accessibility/AccessibleEditableTextPara.cxx | 21 -
editeng/source/editeng/editobj.cxx | 28 -
editeng/source/editeng/editobj2.hxx | 1
editeng/source/rtf/svxrtf.cxx | 18
formula/inc/formula/funcutl.hxx | 3
formula/source/ui/dlg/funcutl.cxx | 16
framework/inc/framework/menuextensionsupplier.hxx | 2
framework/inc/framework/titlehelper.hxx | 1
framework/source/fwe/classes/menuextensionsupplier.cxx | 9
framework/source/fwe/helper/titlehelper.cxx | 17
framework/source/inc/loadenv/loadenv.hxx | 3
framework/source/loadenv/loadenv.cxx | 33 -
lotuswordpro/source/filter/bencont.cxx | 129 ------
lotuswordpro/source/filter/bento.hxx | 2
lotuswordpro/source/filter/lwpoleobject.cxx | 8
lotuswordpro/source/filter/lwpoleobject.hxx | 2
lotuswordpro/source/filter/xfilter/xfdrawpath.cxx | 14
lotuswordpro/source/filter/xfilter/xfdrawpath.hxx | 5
sal/osl/unx/file_url.cxx | 4
sal/qa/osl/file/osl_old_test_file.cxx | 7
sal/rtl/source/alloc_arena.c | 11
sal/rtl/source/alloc_cache.c | 28 +
sal/rtl/source/alloc_global.c | 7
sal/rtl/source/alloc_impl.h | 7
sc/source/core/tool/interpr1.cxx | 12
svl/inc/svl/ctypeitm.hxx | 2
svl/inc/svl/style.hxx | 3
svl/source/items/ctypeitm.cxx | 14
svl/source/items/style.cxx | 250 ------------
svl/source/numbers/numhead.cxx | 18
svl/source/numbers/numhead.hxx | 2
svl/source/numbers/zformat.cxx | 6
svtools/inc/svtools/roadmap.hxx | 1
svtools/inc/svtools/roadmapwizard.hxx | 5
svtools/qa/cppunit/data/sgv/pass/SaveAsPicture.sgv |binary
svtools/qa/cppunit/data/sgv/pass/faxpfeil.sgv |binary
svtools/qa/cppunit/filters-test.cxx | 4
svtools/source/control/roadmap.cxx | 6
svtools/source/dialogs/roadmapwizard.cxx | 24 -
svtools/source/svhtml/parhtml.cxx | 14
svx/inc/svx/svdmodel.hxx | 1
svx/inc/svx/svdotext.hxx | 2
svx/inc/svx/xattr.hxx | 1
svx/inc/svx/xit.hxx | 1
svx/inc/svx/xlineit.hxx | 1
svx/inc/svx/xlndsit.hxx | 2
svx/inc/svx/xoutbmp.hxx | 7
svx/inc/svx/xpoly.hxx | 1
svx/inc/svx/xsflclit.hxx | 1
svx/inc/svx/xtable.hxx | 29 -
svx/source/svdraw/svdotext.cxx | 28 -
svx/source/xoutdev/_xoutbmp.cxx | 180 --------
svx/source/xoutdev/_xpoly.cxx | 49 --
svx/source/xoutdev/xattr.cxx | 14
svx/source/xoutdev/xtabdash.cxx | 86 ----
sw/source/filter/rtf/rtffld.cxx | 19
tools/inc/tools/fsys.hxx | 6
tools/inc/tools/string.hxx | 8
tools/source/fsys/filecopy.cxx | 35 -
tools/source/string/strcvt.cxx | 49 --
unotools/inc/unotools/atom.hxx | 14
unotools/inc/unotools/configitem.hxx | 6
unotools/source/config/configitem.cxx | 23 -
unotools/source/config/configmgr.cxx | 14
unotools/source/misc/atom.cxx | 96 ----
unusedcode.easy | 93 ++--
xmloff/inc/xmloff/txtimp.hxx | 3
xmloff/source/text/txtimp.cxx | 15
79 files changed, 184 insertions(+), 1388 deletions(-)
New commits:
commit 6773616a235fbc55272a64c0e5718278bd007c39
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 13:04:15 2011 +0100
revert this and rely on changed SAL_ALLOW_LINKOO_SYMLINKS behaviour
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index bbfc1a8..04f2f5a 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -65,13 +65,6 @@ namespace osl_test_file
class oldtestfile : public CppUnit::TestFixture
{
public:
- oldtestfile()
- {
- //SAL_ALLOW_LINKOO_SYMLINKS for the make dev-install hack breaks this test
- rtl::OUString envVar(RTL_CONSTASCII_USTRINGPARAM("SAL_ALLOW_LINKOO_SYMLINKS"));
- osl_clearEnvironment(envVar.pData);
- }
-
void test_file_001();
void test_file_002();
void test_file_003();
commit ada4759219efa816ec4c4d29c40cd1428c38e5d4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date: Thu Aug 4 11:42:29 2011 +0200
osl_getAbsoluteFileURL symlinks allowed: ".", ".." still treated
diff --git a/sal/osl/unx/file_url.cxx b/sal/osl/unx/file_url.cxx
index 1d69faa..a2a3dda 100644
--- a/sal/osl/unx/file_url.cxx
+++ b/sal/osl/unx/file_url.cxx
@@ -669,7 +669,9 @@ oslFileError osl_getAbsoluteFileURL(rtl_uString* ustrBaseDirURL, rtl_uString* u
rtl::OUString base;
sal_Int32 last_slash = unresolved_path.lastIndexOf( UNICHAR_SLASH );
- if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength())
+ if (last_slash >= 0 && last_slash + 1 < unresolved_path.getLength()
+ && ! ( last_slash + 2 == unresolved_path.getLength() && unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM("."), last_slash + 1) )
+ && ! ( last_slash + 3 == unresolved_path.getLength() && unresolved_path.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(".."), last_slash + 1) ))
{
base = unresolved_path.copy(last_slash+1);
unresolved_path = unresolved_path.copy(0, last_slash);
commit 2ee5618ba5f56f6f7b8b708e98618c77a4e228fe
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 12:08:44 2011 +0100
add test files
diff --git a/svtools/qa/cppunit/data/sgv/fail/.gitignore b/svtools/qa/cppunit/data/sgv/fail/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/sgv/indeterminate/.gitignore b/svtools/qa/cppunit/data/sgv/indeterminate/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/sgv/pass/.gitignore b/svtools/qa/cppunit/data/sgv/pass/.gitignore
new file mode 100644
index 0000000..e69de29
diff --git a/svtools/qa/cppunit/data/sgv/pass/SaveAsPicture.sgv b/svtools/qa/cppunit/data/sgv/pass/SaveAsPicture.sgv
new file mode 100755
index 0000000..0fe908e
Binary files /dev/null and b/svtools/qa/cppunit/data/sgv/pass/SaveAsPicture.sgv differ
diff --git a/svtools/qa/cppunit/data/sgv/pass/faxpfeil.sgv b/svtools/qa/cppunit/data/sgv/pass/faxpfeil.sgv
new file mode 100755
index 0000000..c8317c6
Binary files /dev/null and b/svtools/qa/cppunit/data/sgv/pass/faxpfeil.sgv differ
commit a840652371e6e42778c0e72bea658a3dc11449cb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 5 21:58:24 2011 +0100
runtime ConvertToUnicode->compile time unicode constants
diff --git a/sw/source/filter/rtf/rtffld.cxx b/sw/source/filter/rtf/rtffld.cxx
index f910aec..eb0b465 100644
--- a/sw/source/filter/rtf/rtffld.cxx
+++ b/sw/source/filter/rtf/rtffld.cxx
@@ -1002,7 +1002,7 @@ void SwRTFParser::ReadField()
int nNumOpenBrakets = 1; // die erste wurde schon vorher erkannt !!
int bFldInst = sal_False, bFldRslt = sal_False;
String sFieldStr, sFieldNm;
- sal_uInt8 cCh;
+ sal_Unicode cCh;
int nToken;
while (nNumOpenBrakets && IsParserWorking())
@@ -1156,16 +1156,15 @@ void SwRTFParser::ReadField()
case RTF_LINE: cCh = '\n'; goto INSINGLECHAR;
case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
- case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
- case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
- case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
- case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
- case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
- case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
- case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
+ case RTF_EMDASH: cCh = 0x2014; goto INSINGLECHAR;
+ case RTF_ENDASH: cCh = 0x2013; goto INSINGLECHAR;
+ case RTF_BULLET: cCh = 0x2022; goto INSINGLECHAR;
+ case RTF_LQUOTE: cCh = 0x2018; goto INSINGLECHAR;
+ case RTF_RQUOTE: cCh = 0x2019; goto INSINGLECHAR;
+ case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR;
+ case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
INSINGLECHAR:
- sFieldStr += ByteString::ConvertToUnicode( cCh,
- RTL_TEXTENCODING_MS_1252 );
+ sFieldStr += cCh;
break;
// kein Break, aToken wird als Text gesetzt
commit ce906b8096081dee15dc8cc96e570d5b0b587955
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 00:31:40 2011 +0100
skip tricky allocators on G_SLICE=always-malloc
diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c
index b063664..571d6de 100644
--- a/sal/rtl/source/alloc_arena.c
+++ b/sal/rtl/source/alloc_arena.c
@@ -37,6 +37,8 @@
#include <string.h>
#include <stdio.h>
+extern AllocMode alloc_mode;
+
/* ================================================================= *
*
* arena internals.
@@ -999,6 +1001,9 @@ SAL_CALL rtl_arena_alloc (
if ((arena != 0) && (pSize != 0))
{
+ if (alloc_mode == AMode_SYSTEM)
+ return rtl_allocateMemory(*pSize);
+
sal_Size size = RTL_MEMORY_ALIGN((*pSize), arena->m_quantum);
if (size > arena->m_qcache_max)
{
@@ -1072,6 +1077,12 @@ SAL_CALL rtl_arena_free (
{
if (arena != 0)
{
+ if (alloc_mode == AMode_SYSTEM)
+ {
+ rtl_freeMemory(addr);
+ return;
+ }
+
size = RTL_MEMORY_ALIGN(size, arena->m_quantum);
if (size > arena->m_qcache_max)
{
diff --git a/sal/rtl/source/alloc_cache.c b/sal/rtl/source/alloc_cache.c
index 91786ad..4fa16f4 100644
--- a/sal/rtl/source/alloc_cache.c
+++ b/sal/rtl/source/alloc_cache.c
@@ -41,6 +41,8 @@
#include <stdio.h>
#endif
+extern AllocMode alloc_mode;
+
/* ================================================================= *
*
* cache internals.
@@ -498,6 +500,7 @@ rtl_cache_slab_alloc (
addr = bufctl;
/* DEBUG ONLY: mark allocated, undefined */
+ /* OSL_DEBUG_ONLY() */ VALGRIND_MAKE_MEM_UNDEFINED(addr, cache->m_type_size);
OSL_DEBUG_ONLY(memset(addr, 0x77777777, cache->m_type_size));
VALGRIND_MEMPOOL_ALLOC(cache, addr, cache->m_type_size);
}
@@ -1203,6 +1206,20 @@ SAL_CALL rtl_cache_alloc (
if (cache == 0)
return (0);
+ if (alloc_mode == AMode_SYSTEM)
+ {
+ obj = rtl_allocateMemory(cache->m_type_size);
+ if ((obj != 0) && (cache->m_constructor != 0))
+ {
+ if (!((cache->m_constructor)(obj, cache->m_userarg)))
+ {
+ /* construction failure */
+ rtl_freeMemory(obj), obj = 0;
+ }
+ }
+ return obj;
+ }
+
RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock));
if (cache->m_cpu_curr != 0)
{
@@ -1278,6 +1295,17 @@ SAL_CALL rtl_cache_free (
{
if ((obj != 0) && (cache != 0))
{
+ if (alloc_mode == AMode_SYSTEM)
+ {
+ if (cache->m_destructor != 0)
+ {
+ /* destruct object */
+ (cache->m_destructor)(obj, cache->m_userarg);
+ }
+ rtl_freeMemory(obj);
+ return;
+ }
+
RTL_MEMORY_LOCK_ACQUIRE(&(cache->m_depot_lock));
for (;;)
diff --git a/sal/rtl/source/alloc_global.c b/sal/rtl/source/alloc_global.c
index 9e0ae7d..e93c666 100644
--- a/sal/rtl/source/alloc_global.c
+++ b/sal/rtl/source/alloc_global.c
@@ -34,12 +34,9 @@
#include <string.h>
#include <stdio.h>
-#if !defined(FORCE_SYSALLOC)
-
-typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
-
-static AllocMode alloc_mode = AMode_UNSET;
+AllocMode alloc_mode = AMode_UNSET;
+#if !defined(FORCE_SYSALLOC)
static void determine_alloc_mode(void)
{
/* This shouldn't happen, but still ... */
diff --git a/sal/rtl/source/alloc_impl.h b/sal/rtl/source/alloc_impl.h
index a226f06..5e68edb 100644
--- a/sal/rtl/source/alloc_impl.h
+++ b/sal/rtl/source/alloc_impl.h
@@ -260,11 +260,12 @@ typedef CRITICAL_SECTION rtl_memory_lock_type;
#define VALGRIND_MEMPOOL_FREE(pool, addr)
#elif defined(HAVE_MEMCHECK_H)
#include <memcheck.h>
-#if !defined(FORCE_SYSALLOC)
-#define FORCE_SYSALLOC 1
-#endif /* !FORCE_SYSALLOC */
#endif /* NVALGRIND || HAVE_MEMCHECK_H */
+typedef enum { AMode_CUSTOM, AMode_SYSTEM, AMode_UNSET } AllocMode;
+
+extern AllocMode alloc_mode;
+
#ifdef __cplusplus
}
#endif
commit c2e61f08aeb53cb2759eb9dd1c1923543cd3ddfc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 01:20:35 2011 +0100
dig out some sgv files for a regression test on that format
diff --git a/svtools/qa/cppunit/filters-test.cxx b/svtools/qa/cppunit/filters-test.cxx
index 490f8d5..6b0f0d4 100644
--- a/svtools/qa/cppunit/filters-test.cxx
+++ b/svtools/qa/cppunit/filters-test.cxx
@@ -141,6 +141,10 @@ void FiltersTest::testCVEs()
recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/emf/pass")), true);
recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/emf/fail")), false);
recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/emf/indeterminate")), 2);
+
+ recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/sgv/pass")), true);
+ recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/sgv/fail")), false);
+ recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/svtools/qa/cppunit/data/sgv/indeterminate")), 2);
}
FiltersTest::FiltersTest()
commit 5a1123ac07d76492191be3f1a204d86cc49e3c69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 00:36:57 2011 +0100
reduce API bReplace is always true
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 9fc46bb..fc7c755 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -256,8 +256,7 @@ public:
rtl_TextEncoding eTarget,
sal_Bool bReplace = sal_True );
static sal_Char Convert( sal_Char c, rtl_TextEncoding eSource,
- rtl_TextEncoding eTarget,
- sal_Bool bReplace = sal_True );
+ rtl_TextEncoding eTarget );
static sal_Char ConvertFromUnicode( sal_Unicode c,
rtl_TextEncoding eTextEncoding,
sal_Bool bReplace = sal_True );
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 71aef08..b64b514 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -387,8 +387,7 @@ ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTar
// =======================================================================
char ByteString::Convert( char c,
- rtl_TextEncoding eSource, rtl_TextEncoding eTarget,
- sal_Bool bReplace )
+ rtl_TextEncoding eSource, rtl_TextEncoding eTarget )
{
// TextEncoding Dontknow kann nicht konvertiert werden
if ( (eSource == RTL_TEXTENCODING_DONTKNOW) || (eTarget == RTL_TEXTENCODING_DONTKNOW) )
@@ -409,7 +408,7 @@ char ByteString::Convert( char c,
(eSource != RTL_TEXTENCODING_UTF8) )
return '\0';
- sal_uChar* pConvertTab = ImplGet1ByteConvertTab( eSource, eTarget, bReplace );
+ sal_uChar* pConvertTab = ImplGet1ByteConvertTab( eSource, eTarget, true );
if ( pConvertTab )
return (char)pConvertTab[(sal_uChar)c];
else
commit cb64bcb4ae4918b4f132c44fa30449bf671f23b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 00:13:18 2011 +0100
callcatcher: ditch some more methods
diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index a6f0ca5..d21897f 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.hxx
@@ -276,9 +276,6 @@ public:
void SetSearchMask(SfxStyleFamily eFam, sal_uInt16 n=0xFFFF );
sal_uInt16 GetSearchMask() const;
SfxStyleFamily GetSearchFamily() const { return nSearchFamily; }
-
- sal_Bool Load( SvStream& );
- sal_Bool Store( SvStream&, sal_Bool bUsed = sal_True );
};
//=========================================================================
diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 2bfbfc4..d5c04cf 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.cxx
@@ -894,112 +894,6 @@ void SfxStyleSheetBase::Store( SvStream& )
{
}
-
-sal_Bool SfxStyleSheetBasePool::Load( SvStream& rStream )
-{
- // alte Version?
- if ( !rPool.IsVer2_Impl() )
- return Load1_Impl( rStream );
-
- // gesamten StyleSheetPool in neuer Version aus einem MiniRecord lesen
- SfxMiniRecordReader aPoolRec( &rStream, SFX_STYLES_REC );
-
- // Header-Record lesen
- short nCharSet = 0;
- if ( !rStream.GetError() )
- {
- SfxSingleRecordReader aHeaderRec( &rStream, SFX_STYLES_REC_HEADER );
- if ( !aHeaderRec.IsValid() )
- return sal_False;
-
- aAppName = rPool.GetName();
- rStream >> nCharSet;
- }
-
- // Styles-Record lesen
- if ( !rStream.GetError() )
- {
- SfxMultiRecordReader aStylesRec( &rStream, SFX_STYLES_REC_STYLES );
- if ( !aStylesRec.IsValid() )
- return sal_False;
-
- rtl_TextEncoding eEnc = GetSOLoadTextEncoding(
- (rtl_TextEncoding)nCharSet,
- sal::static_int_cast< sal_uInt16 >(rStream.GetVersion()) );
- rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
- rStream.SetStreamCharSet( eEnc );
-
- sal_uInt16 nStyles;
- for ( nStyles = 0; aStylesRec.GetContent(); nStyles++ )
- {
- // kann nicht mehr weiterlesen?
- if ( rStream.GetError() )
- break;
-
- // Globale Teile
- XubString aName, aParent, aFollow;
- String aHelpFile;
- sal_uInt16 nFamily, nStyleMask,nCount;
- sal_uInt32 nHelpId;
- rStream.ReadByteString(aName, eEnc );
- rStream.ReadByteString(aParent, eEnc );
- rStream.ReadByteString(aFollow, eEnc );
- rStream >> nFamily >> nStyleMask;
- SfxPoolItem::readByteString(rStream, aHelpFile);
- rStream >> nHelpId;
-
- SfxStyleSheetBase& rSheet = Make( aName, (SfxStyleFamily)nFamily , nStyleMask);
- rSheet.SetHelpId( aHelpFile, nHelpId );
- // Hier erst einmal Parent und Follow zwischenspeichern
- rSheet.aParent = aParent;
- rSheet.aFollow = aFollow;
- sal_uInt32 nPos = rStream.Tell();
- rStream >> nCount;
- if(nCount)
- {
- rStream.Seek( nPos );
- // Das Laden des ItemSets bedient sich der Methode GetItemSet(),
- // damit eigene ItemSets untergeschoben werden koennen
- SfxItemSet& rSet = rSheet.GetItemSet();
- rSet.ClearItem();
- //! SfxItemSet aTmpSet( *pTmpPool );
- /*!aTmpSet*/ rSet.Load( rStream );
- //! rSet.Put( aTmpSet );
- }
- // Lokale Teile
- sal_uInt32 nSize;
- sal_uInt16 nVer;
- rStream >> nVer >> nSize;
- nPos = rStream.Tell() + nSize;
- rSheet.Load( rStream, nVer );
- rStream.Seek( nPos );
- }
-
- // #72939# only loop through the styles that were really inserted
- sal_uLong n = aStyles.size();
-
- //! delete pTmpPool;
- // Jetzt Parent und Follow setzen. Alle Sheets sind geladen.
- // Mit Setxxx() noch einmal den String eintragen, da diese
- // virtuellen Methoden evtl. ueberlagert sind.
- for ( sal_uLong i = 0; i < n; i++ )
- {
- SfxStyleSheetBase* p = aStyles[ i ].get();
- XubString aText = p->aParent;
- p->aParent.Erase();
- p->SetParent( aText );
- aText = p->aFollow;
- p->aFollow.Erase();
- p->SetFollow( aText );
- }
-
- rStream.SetStreamCharSet( eOldEnc );
- }
-
- // alles klar?
- return sal_Bool( rStream.GetError() == SVSTREAM_OK );
-}
-
sal_Bool SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
{
aAppName = rPool.GetName();
@@ -1095,150 +989,6 @@ sal_Bool SfxStyleSheetBasePool::Load1_Impl( SvStream& rStream )
return sal_Bool( rStream.GetError() == SVSTREAM_OK );
}
-sal_Bool SfxStyleSheetBasePool::Store( SvStream& rStream, sal_Bool bUsed )
-{
- // den ganzen StyleSheet-Pool in einen Mini-Record
- SfxMiniRecordWriter aPoolRec( &rStream, SFX_STYLES_REC );
-
- // Erst einmal die Dummies rauszaehlen; die werden nicht gespeichert
- sal_uInt16 nCount = 0;
- for( SfxStyleSheetBase* p = First(); p; p = Next() )
- {
- if(!bUsed || p->IsUsed())
- nCount++;
- }
-
- // einen Header-Record vorweg
- rtl_TextEncoding eEnc
- = ::GetSOStoreTextEncoding(
- rStream.GetStreamCharSet(),
- sal::static_int_cast< sal_uInt16 >(rStream.GetVersion()) );
- rtl_TextEncoding eOldEnc = rStream.GetStreamCharSet();
- rStream.SetStreamCharSet( eEnc );
-
- {
- SfxSingleRecordWriter aHeaderRec( &rStream,
- SFX_STYLES_REC_HEADER,
- STYLESTREAM_VERSION );
- rStream << (short) eEnc;
- }
-
- // die StyleSheets in einen MultiVarRecord
- {
- // Bug 79478:
- // make a check loop, to be shure, that the converted names are also
- // unique like the originals! In other cases we get a loop.
- SvStringsSortDtor aSortOrigNames( 0, 128 );
- SvStrings aOrigNames( 0, 128 );
- SvByteStringsSortDtor aSortConvNames( 0, 128 );
- SvByteStrings aConvNames( 0, 128 );
-
- {
-
- for( SfxStyleSheetBase* p = First(); p; p = Next() )
- {
- if(!bUsed || p->IsUsed())
- {
- sal_uInt16 nFamily = (sal_uInt16)p->GetFamily();
- String* pName = new String( p->GetName() );
- ByteString* pConvName = new ByteString( *pName, eEnc );
-
- pName->Insert( (sal_Unicode)nFamily, 0 );
- pConvName->Insert( " ", 0 );
- pConvName->SetChar(
- 0,
- sal::static_int_cast< char >(0xff & (nFamily >> 8)) );
- pConvName->SetChar(
- 1, sal::static_int_cast< char >(0xff & nFamily) );
-
- sal_uInt16 nInsPos, nAdd = aSortConvNames.Count();
- while( !aSortConvNames.Insert( pConvName, nInsPos ) )
- (pConvName->Append( '_' )).Append(ByteString(
- rtl::OString::valueOf(static_cast<sal_Int32>(nAdd++))));
- aOrigNames.Insert( pName, nInsPos );
- }
- }
-
- // now we have the list of the names, sorted by convertede names
- // But now we need the sorted list of orignames.
- {
- sal_uInt16 nInsPos, nEnd = aOrigNames.Count();
- const ByteStringPtr* ppB = aSortConvNames.GetData();
- for( sal_uInt16 n = 0; n < nEnd; ++n, ++ppB )
- {
- String* p = aOrigNames.GetObject( n );
- aSortOrigNames.Insert( p, nInsPos );
- aConvNames.Insert( *ppB, nInsPos );
- }
-
- }
- }
-
-
- ByteString sEmpty;
- sal_uInt16 nFndPos;
- String sNm;
- SfxMultiVarRecordWriter aStylesRec( &rStream, SFX_STYLES_REC_STYLES, 0 );
- for( SfxStyleSheetBase* p = First(); p; p = Next() )
- {
- if(!bUsed || p->IsUsed())
- {
- aStylesRec.NewContent();
-
- // Globale Teile speichern
- String aHelpFile;
- sal_uInt32 nHelpId = p->GetHelpId( aHelpFile );
- sal_uInt16 nFamily = sal::static_int_cast< sal_uInt16 >(p->GetFamily());
- String sFamily( (sal_Unicode)nFamily );
-
- (sNm = sFamily) += p->GetName();
- if( aSortOrigNames.Seek_Entry( &sNm, &nFndPos ))
- rStream.WriteByteString( aConvNames.GetObject( nFndPos )->Copy( 2 ));
- else
- rStream.WriteByteString( sEmpty );
-
- (sNm = sFamily) += p->GetParent();
- if( aSortOrigNames.Seek_Entry( &sNm, &nFndPos ))
- rStream.WriteByteString( aConvNames.GetObject( nFndPos )->Copy( 2 ));
- else
- rStream.WriteByteString( sEmpty );
-
- (sNm = sFamily) += p->GetFollow();
- if( aSortOrigNames.Seek_Entry( &sNm, &nFndPos ))
- rStream.WriteByteString( aConvNames.GetObject( nFndPos )->Copy( 2 ));
- else
- rStream.WriteByteString( sEmpty );
-
- rStream << nFamily << p->GetMask();
- SfxPoolItem::writeByteString(rStream, aHelpFile);
- rStream << nHelpId;
- if(p->pSet)
- p->pSet->Store( rStream );
- else
- rStream << (sal_uInt16)0;
-
- // Lokale Teile speichern
- // Vor dem lokalen Teil wird die Laenge der lokalen Daten
- // als sal_uInt32 sowie die Versionsnummer gespeichert.
- rStream << (sal_uInt16) p->GetVersion();
- sal_uLong nPos1 = rStream.Tell();
- rStream << (sal_uInt32) 0;
- p->Store( rStream );
- sal_uLong nPos2 = rStream.Tell();
- rStream.Seek( nPos1 );
- rStream << (sal_uInt32) ( nPos2 - nPos1 - sizeof( sal_uInt32 ) );
- rStream.Seek( nPos2 );
- if( rStream.GetError() != SVSTREAM_OK )
- break;
- }
- }
- }
-
- rStream.SetStreamCharSet( eOldEnc );
-
- return sal_Bool( rStream.GetError() == SVSTREAM_OK );
-}
-
SfxItemPool& SfxStyleSheetBasePool::GetPool()
{
return rPool;
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 21cb239..632b4c1 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -396,14 +396,8 @@ public:
FSysError ExecuteExact( FSysAction nActions = FSYS_ACTION_STANDARD,
FSysExact eExact = FSYS_NOTEXACT);
- const DirEntry* GetErrorSource() const;
- const DirEntry* GetErrorTarget() const;
- ErrCode GetError() const;
-
void SetProgressHdl( const Link& rLink ) { aProgressLink = rLink; }
const Link& GetProgressHdl() const { return aProgressLink; }
- void SetErrorHdl( const Link& rLink );
- const Link& GetErrorHdl() const;
};
// -------
diff --git a/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx
index 8629f2b..969988e 100644
--- a/tools/source/fsys/filecopy.cxx
+++ b/tools/source/fsys/filecopy.cxx
@@ -149,41 +149,6 @@ ErrCode FileCopier::Error( ErrCode eErr, const DirEntry* pSource, const DirEntry
return eRet;
}
-//---------------------------------------------------------------------------
-
-const DirEntry* FileCopier::GetErrorSource() const
-{
- return pImp->pErrSource;
-}
-
-//---------------------------------------------------------------------------
-
-const DirEntry* FileCopier::GetErrorTarget() const
-{
- return pImp->pErrTarget;
-}
-
-//---------------------------------------------------------------------------
-
-ErrCode FileCopier::GetError() const
-{
- return pImp->eErr;
-}
-
-//---------------------------------------------------------------------------
-
-void FileCopier::SetErrorHdl( const Link &rLink )
-{
- pImp->aErrorLink = rLink;
-}
-
-//---------------------------------------------------------------------------
-
-const Link& FileCopier::GetErrorHdl() const
-{
- return pImp->aErrorLink ;
-}
-
/*************************************************************************
|*
|* FileCopier::Execute()
diff --git a/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index c6cff25..714355f 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.hxx
@@ -112,20 +112,6 @@ namespace utl {
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::AtomDescription > SAL_CALL getRecentAtoms( sal_Int32 atomClass, sal_Int32 atom ) throw();
virtual sal_Int32 SAL_CALL getAtom( sal_Int32 atomClass, const ::rtl::OUString& description, sal_Bool create ) throw();
};
-
- class AtomClient
- {
- private:
- ::com::sun::star::uno::Reference< ::com::sun::star::util::XAtomServer > m_xServer;
- MultiAtomProvider m_aProvider;
- public:
- AtomClient( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XAtomServer >& );
- ~AtomClient();
-
- void updateAtomClasses( const ::com::sun::star::uno::Sequence< sal_Int32 >& atomClasses );
- int getAtom( int atomClass, const ::rtl::OUString& description, sal_Bool bCreate );
- const ::rtl::OUString& getString( int atomClass, int atom );
- };
}
#endif
diff --git a/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx
index dd1ab69..1b1558d 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/unotools/inc/unotools/configitem.hxx
@@ -117,7 +117,6 @@ namespace utl
protected:
ConfigItem(const rtl::OUString &rSubTree,
sal_Int16 nMode = CONFIG_MODE_DELAYED_UPDATE);
- ConfigItem(utl::ConfigManager& rManager, const rtl::OUString rSubTree);
void SetModified (); // mark item as modified
void ClearModified(); // reset state after commit!
@@ -189,11 +188,6 @@ namespace utl
/** is called from the ConfigManager if it is destroyed before the ConfigItem. */
void ReleaseConfigMgr();
- /** enable locking of the XHierarchicalNameAccess if CONFIG_MODE_RELEASE_TREE is set to
- prevent multiple calls ConfigManager::AcquireTree() from a single Commit() operation*/
- void LockTree();
- void UnlockTree();
-
const rtl::OUString& GetSubTreeName() const {return sSubTree;}
sal_Bool IsModified() const;
diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 0832b20..254b918 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.cxx
@@ -237,15 +237,6 @@ ConfigItem::ConfigItem(const OUString &rSubTree, sal_Int16 nSetMode ) :
pImpl->nMode &= ~CONFIG_MODE_PROPAGATE_ERRORS;
}
-ConfigItem::ConfigItem(utl::ConfigManager& rManager, const rtl::OUString rSubTree) :
- sSubTree(rSubTree),
- pImpl(new ConfigItem_Impl)
-{
- pImpl->pManager = &rManager;
- pImpl->nMode = CONFIG_MODE_IMMEDIATE_UPDATE; // does not allow exceptions
- m_xHierarchyAccess = pImpl->pManager->AddConfigItem(*this);
-}
-
sal_Bool ConfigItem::IsValidConfigMgr() const
{
return ( pImpl->pManager && pImpl->pManager->GetConfigurationProvider().is() );
@@ -1327,18 +1318,4 @@ Reference< XHierarchicalNameAccess> ConfigItem::GetTree()
return xRet;
}
-void ConfigItem::LockTree()
-{
- OSL_ENSURE(0 != (pImpl->nMode&CONFIG_MODE_RELEASE_TREE), "call LockTree in CONFIG_MODE_RELEASE_TREE mode, only");
- m_xHierarchyAccess = GetTree();
-}
-
-void ConfigItem::UnlockTree()
-{
- OSL_ENSURE(0 != (pImpl->nMode&CONFIG_MODE_RELEASE_TREE), "call UnlockTree in CONFIG_MODE_RELEASE_TREE mode, only");
- if(0 != (pImpl->nMode&CONFIG_MODE_RELEASE_TREE))
- m_xHierarchyAccess = 0;
-}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index d8bf5bb..b54c7da 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.cxx
@@ -287,100 +287,4 @@ Sequence< ::rtl::OUString > AtomServer::getAtomDescriptions( const Sequence< Ato
return aRet;
}
-// -----------------------------------------------------------------------
-
-AtomClient::AtomClient( const Reference< XAtomServer >& xServer ) :
- m_xServer( xServer )
-{
-}
-
-AtomClient::~AtomClient()
-{
-}
-
-int AtomClient::getAtom( int atomClass, const ::rtl::OUString& description, sal_Bool bCreate )
-{
- int nAtom = m_aProvider.getAtom( atomClass, description, sal_False );
- if( nAtom == INVALID_ATOM && bCreate )
- {
- try
- {
- nAtom = m_xServer->getAtom( atomClass, description, bCreate );
- }
- catch( RuntimeException& )
- {
- return INVALID_ATOM;
- }
- if( nAtom != INVALID_ATOM )
- m_aProvider.overrideAtom( atomClass, nAtom, description );
- }
- return nAtom;
-}
-
-const ::rtl::OUString& AtomClient::getString( int atomClass, int atom )
-{
- static ::rtl::OUString aEmpty;
-
- if( ! m_aProvider.hasAtom( atomClass, atom ) )
- {
- Sequence< NMSP_UTIL::AtomDescription > aSeq;
- try
- {
- aSeq = m_xServer->getRecentAtoms( atomClass, m_aProvider.getLastAtom( atomClass ) );
- }
- catch( RuntimeException& )
- {
- return aEmpty;
- }
- const NMSP_UTIL::AtomDescription* pDescriptions = aSeq.getConstArray();
- for( int i = 0; i < aSeq.getLength(); i++ )
- m_aProvider.overrideAtom( atomClass,
- pDescriptions[i].atom,
- pDescriptions[i].description
- );
-
- if( ! m_aProvider.hasAtom( atomClass, atom ) )
- {
- // holes may occur by the above procedure!
- Sequence< AtomClassRequest > aReq( 1 );
- aReq.getArray()[0].atomClass = atomClass;
- aReq.getArray()[0].atoms.realloc( 1 );
- aReq.getArray()[0].atoms.getArray()[0] = atom;
- Sequence< ::rtl::OUString > aRet;
- try
- {
- aRet = m_xServer->getAtomDescriptions( aReq );
- }
- catch( RuntimeException& )
- {
- return aEmpty;
- }
- if( aRet.getLength() == 1 )
- m_aProvider.overrideAtom( atomClass, atom, aRet.getConstArray()[0] );
- }
- }
- return m_aProvider.getString( atomClass, atom );
-}
-
-void AtomClient::updateAtomClasses( const Sequence< sal_Int32 >& atomClasses )
-{
- Sequence< Sequence< NMSP_UTIL::AtomDescription > > aUpdate;
- try
- {
- aUpdate = m_xServer->getClasses( atomClasses );
- }
- catch( RuntimeException& )
- {
- return;
- }
- for( int i = 0; i < atomClasses.getLength(); i++ )
- {
- int nClass = atomClasses.getConstArray()[i];
- const Sequence< NMSP_UTIL::AtomDescription >& rClass = aUpdate.getConstArray()[i];
- const NMSP_UTIL::AtomDescription* pDesc = rClass.getConstArray();
- for( int n = 0; n < rClass.getLength(); n++, pDesc++ )
- m_aProvider.overrideAtom( nClass, pDesc->atom, pDesc->description );
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 8a3cdcdc5d705b55173b611305e2e088cab75a7d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 23:35:21 2011 +0100
callcatcher: remove unused methods
diff --git a/svtools/inc/svtools/roadmap.hxx b/svtools/inc/svtools/roadmap.hxx
index 988af84..9ca04fd 100644
--- a/svtools/inc/svtools/roadmap.hxx
+++ b/svtools/inc/svtools/roadmap.hxx
@@ -70,7 +70,6 @@ namespace svt
~ORoadmap( );
void SetRoadmapBitmap( const BitmapEx& maBitmap, sal_Bool _bInvalidate = sal_True );
- const BitmapEx& GetRoadmapBitmap( ) const;
void EnableRoadmapItem( ItemId _nItemId, sal_Bool _bEnable, ItemIndex _nStartIndex = 0 );
sal_Bool IsRoadmapItemEnabled( ItemId _nItemId, ItemIndex _nStartIndex = 0 ) const;
diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 14f8446..7848be5 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.cxx
@@ -334,12 +334,6 @@ namespace svt
}
//---------------------------------------------------------------------
- const BitmapEx& ORoadmap::GetRoadmapBitmap( ) const
- {
- return m_pImpl->getPicture( );
- }
-
- //---------------------------------------------------------------------
void ORoadmap::SetRoadmapInteractive( sal_Bool _bInteractive )
{
m_pImpl->setInteractive( _bInteractive );
commit 87025228f44662e46ad9353ebf2ba26e7574b074
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 23:34:07 2011 +0100
callcatcher: remove unused methods
diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index dcb16ef..169bed6 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.cxx
@@ -143,24 +143,6 @@ ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader()
rStream.Seek(nEndPos);
}
-//! mit ctor synchron
-// static
-void ImpSvNumMultipleReadHeader::Skip( SvStream& rStream )
-{
- sal_uInt32 nDataSize;
- rStream >> nDataSize;
- rStream.SeekRel( nDataSize );
- sal_uInt16 nID;
- rStream >> nID;
- if ( nID != SV_NUMID_SIZES )
- {
- OSL_FAIL("SV_NUMID_SIZES nicht gefunden");
- }
- sal_uInt32 nSizeTableLen;
- rStream >> nSizeTableLen;
- rStream.SeekRel( nSizeTableLen );
-}
-
//#pragma SEG_FUNCDEF(numhead_08)
void ImpSvNumMultipleReadHeader::EndEntry()
diff --git a/svl/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx
index 8ccd914..6043755 100644
--- a/svl/source/numbers/numhead.hxx
+++ b/svl/source/numbers/numhead.hxx
@@ -81,8 +81,6 @@ public:
void StartEntry();
void EndEntry();
sal_uLong BytesLeft() const;
-
- static void Skip( SvStream& ); // komplett ueberspringen
};
class ImpSvNumMultipleWriteHeader
commit d3ad51015c1e75cf72143867ae1031639bb256ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 23:33:53 2011 +0100
drop deprecated ByteString::ConvertToUnicode
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 040be7e..9fc46bb 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.hxx
@@ -164,9 +164,6 @@ private:
TOOLS_DLLPRIVATE void ImplStringConvert(
rtl_TextEncoding, rtl_TextEncoding, sal_Bool);
- TOOLS_DLLPRIVATE static sal_Unicode ConvertToUnicode(
- const sal_Char* pChar, sal_Size* pLen, rtl_TextEncoding eTextEncoding);
-
ByteString( const int* pDummy ); // not implemented: to prevent ByteString( NULL )
ByteString(int); // not implemented; to detect misuses
// of ByteString(sal_Char);
@@ -261,8 +258,6 @@ public:
static sal_Char Convert( sal_Char c, rtl_TextEncoding eSource,
rtl_TextEncoding eTarget,
sal_Bool bReplace = sal_True );
- static sal_Unicode ConvertToUnicode( sal_Char c,
- rtl_TextEncoding eTextEncoding );
static sal_Char ConvertFromUnicode( sal_Unicode c,
rtl_TextEncoding eTextEncoding,
sal_Bool bReplace = sal_True );
diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index c7519bd..71aef08 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.cxx
@@ -416,14 +416,6 @@ char ByteString::Convert( char c,
return '\0';
}
-// =======================================================================
-
-sal_Unicode ByteString::ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding )
-{
- sal_Size nLen = 1;
- return ConvertToUnicode( &c, &nLen, eTextEncoding );
-}
-
// -----------------------------------------------------------------------
char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, sal_Bool bReplace )
@@ -439,42 +431,6 @@ char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncodi
// -----------------------------------------------------------------------
-sal_Unicode ByteString::ConvertToUnicode( const char* pChar, sal_Size* pLen, rtl_TextEncoding eTextEncoding )
-{
- // TextEncoding Dontknow wird nicht konvertiert
- if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW )
- return 0;
-
- rtl_TextToUnicodeConverter hConverter;
- sal_uInt32 nInfo;
- sal_Size nSrcBytes;
- sal_Size nDestChars;
- sal_Unicode nConvChar;
- hConverter = rtl_createTextToUnicodeConverter( eTextEncoding );
- nDestChars = rtl_convertTextToUnicode( hConverter, 0,
- (const sal_Char*)pChar, *pLen,
- &nConvChar, 1,
- RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_FLUSH,
- &nInfo, &nSrcBytes );
- rtl_destroyTextToUnicodeConverter( hConverter );
-
- if ( nDestChars == 1 )
- {
- *pLen = nSrcBytes;
- return nConvChar;
- }
- else
- {
- *pLen = 0;
- return 0;
- }
-}
-
-// -----------------------------------------------------------------------
-
sal_Size ByteString::ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBufLen, rtl_TextEncoding eTextEncoding,
sal_Bool bReplace )
{
commit 5e6c0fb9ce04ec3f0115aa459e981372fa7e13be
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 23:09:44 2011 +0100
dont need FLUSH afaics
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index 0a15131..8cfe024 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -500,8 +500,7 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
const sal_uInt32 convertFlags =
RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT |
- RTL_TEXTTOUNICODE_FLAGS_FLUSH;
+ RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT;
sal_Char cEncodedChar = static_cast<sal_Char>(cChar);
cChar = rtl::OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar();
commit 6909de036217b4f903d2caa26062be26226468db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 21:44:00 2011 +0100
ByteString::ConvertToUnicode->rtl::OUString::ctor::toChar
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 5c9eb7d..84ab55b 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.cxx
@@ -1779,9 +1779,9 @@ void SvNumberformat::LoadString( SvStream& rStream, String& rStr )
if ( *p == cStream )
*pUni = cTarget;
else
- *pUni = ByteString::ConvertToUnicode( *p, eStream );
- p++;
- pUni++;
+ *pUni = rtl::OUString(p, 1, eStream).toChar();
+ ++p;
+ ++pUni;
}
*pUni = 0;
}
commit eb90c628840d47ab9a72a81c3e7e3faf7b6619cf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 21:39:18 2011 +0100
ByteString::ConvertToUnicode->rtl::OUString::ctor::toChar
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index acb8635..0a15131 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.cxx
@@ -495,17 +495,22 @@ int HTMLParser::ScanText( const sal_Unicode cBreak )
if( RTL_TEXTENCODING_DONTKNOW != eSrcEnc &&
RTL_TEXTENCODING_UCS2 != eSrcEnc &&
RTL_TEXTENCODING_UTF8 != eSrcEnc &&
- cChar < 256 )
+ cChar < 256 )
{
- sal_Unicode cOrig = cChar;
- cChar = ByteString::ConvertToUnicode(
- (sal_Char)cChar, eSrcEnc );
+ const sal_uInt32 convertFlags =
+ RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT |
+ RTL_TEXTTOUNICODE_FLAGS_FLUSH;
+
+ sal_Char cEncodedChar = static_cast<sal_Char>(cChar);
+ cChar = rtl::OUString(&cEncodedChar, 1, eSrcEnc, convertFlags).toChar();
if( 0U == cChar )
{
// If the character could not be
// converted, because a conversion is not
// available, do no conversion at all.
- cChar = cOrig;
+ cChar = cEncodedChar;
}
}
}
commit dd853ad626ddaff20a2d418f99279aa931b90c97
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 01:52:30 2011 +0100
callcatcher: unused methods
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index 82f0bd1..d4c91a1 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.hxx
@@ -44,7 +44,6 @@ public:
CntContentTypeItem();
CntContentTypeItem( sal_uInt16 nWhich, const XubString& rType );
- CntContentTypeItem( sal_uInt16 nWhich, const INetContentType eType );
CntContentTypeItem( const CntContentTypeItem& rOrig );
virtual SfxPoolItem* Create( SvStream& rStream,
@@ -58,7 +57,6 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = NULL ) const;
void SetValue( const XubString& rNewVal );
- void SetPresentation( const XubString& rNewVal );
using SfxPoolItem::Compare;
virtual int Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const;
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d1fe8b9..dafba90 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -64,14 +64,6 @@ CntContentTypeItem::CntContentTypeItem( sal_uInt16 which, const XubString& rType
}
//----------------------------------------------------------------------------
-CntContentTypeItem::CntContentTypeItem( sal_uInt16 which,
- const INetContentType eType )
-: CntUnencodedStringItem( which, INetContentTypes::GetContentType( eType ) ),
- _eType( eType )
-{
-}
-
-//----------------------------------------------------------------------------
CntContentTypeItem::CntContentTypeItem( const CntContentTypeItem& rOrig )
: CntUnencodedStringItem( rOrig ),
_eType( rOrig._eType ),
@@ -152,12 +144,6 @@ void CntContentTypeItem::SetValue( const XubString& rNewVal )
}
//----------------------------------------------------------------------------
-void CntContentTypeItem::SetPresentation( const XubString& rNewVal )
-{
- _aPresentation = rNewVal;
-}
-
-//----------------------------------------------------------------------------
int CntContentTypeItem::Compare( const SfxPoolItem &rWith, const IntlWrapper& rIntlWrapper ) const
{
String aOwnText, aWithText;
commit 5c8a542270ec4e28771baf6b1fe38e5f097d5082
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 6 00:34:04 2011 +0100
dump dangling config item names before assert
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 4f83a86..7f411ea 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -122,17 +122,23 @@ ConfigManager::~ConfigManager()
{
//check list content -> should be empty!
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE(pMgrImpl->aItemList.empty(), "some ConfigItems are still alive");
-#endif
if(!pMgrImpl->aItemList.empty())
{
ConfigItemList::iterator aListIter;
- for(aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
+ for (aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
{
ConfigItemListEntry_Impl& rEntry = *aListIter;
-#if OSL_DEBUG_LEVEL > 0
fprintf(stderr, "Dangling config item of %s\n", rtl::OUStringToOString(rEntry.pConfigItem->GetSubTreeName(), RTL_TEXTENCODING_UTF8).getStr());
+ }
+ }
#endif
+ OSL_ENSURE(pMgrImpl->aItemList.empty(), "some ConfigItems are still alive");
+ if(!pMgrImpl->aItemList.empty())
+ {
+ ConfigItemList::iterator aListIter;
+ for(aListIter = pMgrImpl->aItemList.begin(); aListIter != pMgrImpl->aItemList.end(); ++aListIter)
+ {
+ ConfigItemListEntry_Impl& rEntry = *aListIter;
rEntry.pConfigItem->ReleaseConfigMgr();
}
pMgrImpl->aItemList.erase(pMgrImpl->aItemList.begin(), pMgrImpl->aItemList.end());
commit 5796909fbdb23553fe20815eed90fa30d2a9a024
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 5 21:50:29 2011 +0100
remove unused roadmapwizard methods
diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx
index 5df0ac4..ef188cc 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/svtools/inc/svtools/roadmapwizard.hxx
@@ -88,14 +88,9 @@ namespace svt
);
~RoadmapWizard( );
- void SetRoadmapBitmap( const BitmapEx& _rBitmap );
- const BitmapEx& GetRoadmapBitmap( ) const;
-
void SetRoadmapHelpId( const rtl::OString& _rId );
- const rtl::OString& GetRoadmapHelpId() const;
void SetRoadmapInteractive( sal_Bool _bInteractive );
- sal_Bool IsRoadmapInteractive();
virtual void Resize();
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index a80641f..3b556e1 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.cxx
@@ -228,42 +228,18 @@ namespace svt
}
//--------------------------------------------------------------------
- void RoadmapWizard::SetRoadmapBitmap( const BitmapEx& _rBitmap )
- {
- m_pImpl->pRoadmap->SetRoadmapBitmap( _rBitmap );
- }
-
- //--------------------------------------------------------------------
- const BitmapEx& RoadmapWizard::GetRoadmapBitmap( ) const
- {
- return m_pImpl->pRoadmap->GetRoadmapBitmap();
- }
-
- //--------------------------------------------------------------------
void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId )
{
m_pImpl->pRoadmap->SetHelpId( _rId );
}
//--------------------------------------------------------------------
- const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const
- {
- return m_pImpl->pRoadmap->GetHelpId();
- }
-
- //--------------------------------------------------------------------
void RoadmapWizard::SetRoadmapInteractive( sal_Bool _bInteractive )
{
m_pImpl->pRoadmap->SetRoadmapInteractive( _bInteractive );
}
//--------------------------------------------------------------------
- sal_Bool RoadmapWizard::IsRoadmapInteractive()
- {
- return m_pImpl->pRoadmap->IsRoadmapInteractive();
- }
-
- //--------------------------------------------------------------------
void RoadmapWizard::declarePath( PathId _nPathId, const WizardPath& _lWizardStates)
{
DBG_CHKTHIS( RoadmapWizard, CheckInvariants );
commit 1c074d078bd2f95bb0f11007437a0ca01ae35c35
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 00:14:26 2011 +0100
fix syntax
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index b780286..e34c33d 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -929,7 +929,7 @@ void EditBox::UpdateOldSel()
RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) :
Edit( _pParent, rResId ),
- pAnyRefDlg( pParent ),
+ pAnyRefDlg( pParent )
{
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME );
@@ -937,7 +937,7 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
Edit( pParent, rResId ),
- pAnyRefDlg( NULL ),
+ pAnyRefDlg( NULL )
{
}
commit 5298b1b32d90002be8d09fe82955550c18eae8bc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:48:55 2011 +0100
callcatcher: ditch some more methods
diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx
index a99cd36..1d7f128 100644
--- a/connectivity/inc/connectivity/sqlparse.hxx
+++ b/connectivity/inc/connectivity/sqlparse.hxx
@@ -97,14 +97,6 @@ namespace connectivity
// determines the default international setting
static const ::com::sun::star::lang::Locale& getDefaultLocale();
- /** set's the default locale which should be used when analyzing strings
- <p>If no locale is set, and any method which needs a locale is called, a default
- (en-US) is used.</p>
- <p>If, while parsing, the locale can be obtained from other sources (such as the number format
- set for a table column), the preferred locale is ignored.</p>
- */
- static void setDefaultLocale( const ::com::sun::star::lang::Locale& _rLocale );
-
/** get's a locale instance which should be used when parsing in the context specified by this instance
<p>if this is not overridden by derived classes, it returns the static default locale.</p>
*/
diff --git a/connectivity/source/parse/sqlbison.y b/connectivity/source/parse/sqlbison.y
index 1f2c577..d7e7c67 100755
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -4477,12 +4477,6 @@ static Locale& impl_getLocaleInstance( )
}
//------------------------------------------------------------------------------
-void OParseContext::setDefaultLocale( const ::com::sun::star::lang::Locale& _rLocale )
-{
- impl_getLocaleInstance() = _rLocale;
-}
-
-//------------------------------------------------------------------------------
Locale OParseContext::getPreferredLocale( ) const
{
return getDefaultLocale();
diff --git a/editeng/inc/editeng/AccessibleEditableTextPara.hxx b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
index 1e2497f..dac131a 100644
--- a/editeng/inc/editeng/AccessibleEditableTextPara.hxx
+++ b/editeng/inc/editeng/AccessibleEditableTextPara.hxx
@@ -339,9 +339,6 @@ namespace accessibility
int getNotifierClientId() const;
- // retrieve text interface for given paragraph index
- ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleText > GetParaInterface( sal_Int32 nIndex );
-
/// Do we have children? This is the case for image bullets
sal_Bool HaveChildren();
diff --git a/editeng/inc/editeng/editobj.hxx b/editeng/inc/editeng/editobj.hxx
index 66d17d3..9834649 100644
--- a/editeng/inc/editeng/editobj.hxx
+++ b/editeng/inc/editeng/editobj.hxx
@@ -82,7 +82,6 @@ public:
sal_Bool Store( SvStream& rOStream ) const;
static EditTextObject* Create( SvStream& rIStream,
SfxItemPool* pGlobalTextObjectPool = 0 );
- void Skip( SvStream& rIStream );
virtual sal_uInt16 GetParagraphCount() const;
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 7f314ea..7214662 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -530,27 +530,6 @@ namespace accessibility
return mpEditSource ? sal_True : sal_False ;
}
- uno::Reference< XAccessibleText > AccessibleEditableTextPara::GetParaInterface( sal_Int32 nIndex )
- {
- DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
-
- uno::Reference< XAccessible > xParent = getAccessibleParent();
- if( xParent.is() )
- {
- uno::Reference< XAccessibleContext > xParentContext = xParent->getAccessibleContext();
- if( xParentContext.is() )
- {
- uno::Reference< XAccessible > xPara = xParentContext->getAccessibleChild( nIndex );
- if( xPara.is() )
- {
- return uno::Reference< XAccessibleText > ( xPara, uno::UNO_QUERY );
- }
- }
- }
-
- return uno::Reference< XAccessibleText >();
- }
-
SvxEditSourceAdapter& AccessibleEditableTextPara::GetEditSource() const SAL_THROW((uno::RuntimeException))
{
DBG_CHKTHIS( AccessibleEditableTextPara, NULL );
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index 60ee099..3ddf1e8 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -420,20 +420,6 @@ EditTextObject* EditTextObject::Create( SvStream& rIStream, SfxItemPool* pGlobal
return pTxtObj;
}
-void EditTextObject::Skip( SvStream& rIStream )
-{
- sal_Size nStartPos = rIStream.Tell();
-
- sal_uInt16 _nWhich;
- rIStream >> _nWhich;
-
- sal_uInt32 nStructSz;
- rIStream >> nStructSz;
-
- sal_Size nFullSz = sizeof( _nWhich ) + sizeof( nStructSz ) + nStructSz;
- rIStream.Seek( nStartPos + nFullSz );
-}
-
void EditTextObject::StoreData( SvStream& ) const
{
OSL_FAIL( "StoreData: Base class!" );
diff --git a/formula/inc/formula/funcutl.hxx b/formula/inc/formula/funcutl.hxx
index fd6c3a7..188e0b4 100644
--- a/formula/inc/formula/funcutl.hxx
+++ b/formula/inc/formula/funcutl.hxx
@@ -43,7 +43,6 @@ class FORMULA_DLLPUBLIC RefEdit : public Edit
private:
Timer aTimer;
IControlReferenceHandler* pAnyRefDlg; // parent dialog
- sal_Bool bSilentFocus; // for SilentGrabFocus()
DECL_LINK( UpdateHdl, Timer* );
@@ -71,8 +70,6 @@ public:
void StartUpdateData();
- void SilentGrabFocus(); // does not update any references
-
void SetRefDialog( IControlReferenceHandler* pDlg );
inline IControlReferenceHandler* GetRefDialog() { return pAnyRefDlg; }
};
diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx
index 884ecb7..b780286 100644
--- a/formula/source/ui/dlg/funcutl.cxx
+++ b/formula/source/ui/dlg/funcutl.cxx
@@ -930,7 +930,6 @@ void EditBox::UpdateOldSel()
RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResId& rResId ) :
Edit( _pParent, rResId ),
pAnyRefDlg( pParent ),
- bSilentFocus( sal_False )
{
aTimer.SetTimeoutHdl( LINK( this, RefEdit, UpdateHdl ) );
aTimer.SetTimeout( SC_ENABLE_TIME );
@@ -939,7 +938,6 @@ RefEdit::RefEdit( Window* _pParent,IControlReferenceHandler* pParent, const ResI
RefEdit::RefEdit( Window* pParent, const ResId& rResId ) :
Edit( pParent, rResId ),
pAnyRefDlg( NULL ),
- bSilentFocus( sal_False )
{
}
@@ -979,13 +977,6 @@ void RefEdit::StartUpdateData()
aTimer.Start();
}
-void RefEdit::SilentGrabFocus()
-{
- bSilentFocus = sal_True;
- GrabFocus();
- bSilentFocus = sal_False;
-}
-
void RefEdit::SetRefDialog( IControlReferenceHandler* pDlg )
{
pAnyRefDlg = pDlg;
@@ -1021,8 +1012,7 @@ void RefEdit::KeyInput( const KeyEvent& rKEvt )
void RefEdit::GetFocus()
{
Edit::GetFocus();
- if( !bSilentFocus )
- StartUpdateData();
+ StartUpdateData();
}
void RefEdit::LoseFocus()
diff --git a/framework/inc/framework/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx
index d6b8d88..4e1dcbd 100644
--- a/framework/inc/framework/menuextensionsupplier.hxx
+++ b/framework/inc/framework/menuextensionsupplier.hxx
@@ -43,8 +43,6 @@ typedef MenuExtensionItem ( *pfunc_setMenuExtensionSupplier)();
namespace framework
{
-FWE_DLLPUBLIC pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pSetMenuExtensionSupplier );
-
FWE_DLLPUBLIC MenuExtensionItem SAL_CALL GetMenuExtension();
}
diff --git a/framework/inc/framework/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx
index ed1ded3..6b3ba6c 100644
--- a/framework/inc/framework/titlehelper.hxx
+++ b/framework/inc/framework/titlehelper.hxx
@@ -185,7 +185,6 @@ class FWE_DLLPUBLIC TitleHelper : private ::cppu::BaseMutex
void impl_appendDebugVersion (::rtl::OUStringBuffer& sTitle);
void impl_setSubTitle (const css::uno::Reference< css::frame::XTitle >& xSubTitle);
- ::rtl::OUString impl_getSubTitle ();
::rtl::OUString impl_convertURL2Title(const ::rtl::OUString& sURL);
diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx
index 20256a7..40826eb 100644
--- a/framework/source/fwe/classes/menuextensionsupplier.cxx
+++ b/framework/source/fwe/classes/menuextensionsupplier.cxx
@@ -36,15 +36,6 @@ static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL;
namespace framework
{
-pfunc_setMenuExtensionSupplier SAL_CALL SetMenuExtensionSupplier( pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFuncArg )
-{
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
-
- pfunc_setMenuExtensionSupplier pOldMenuExtensionSupplierFunc = pMenuExtensionSupplierFunc;
- pMenuExtensionSupplierFunc = pMenuExtensionSupplierFuncArg;
- return pOldMenuExtensionSupplierFunc;
-}
-
MenuExtensionItem SAL_CALL GetMenuExtension()
{
MenuExtensionItem aItem;
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 23d18b8..7b39cf0 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -680,23 +680,6 @@ void TitleHelper::impl_setSubTitle (const css::uno::Reference< css::frame::XTitl
}
//-----------------------------------------------
-::rtl::OUString TitleHelper::impl_getSubTitle ()
-{
- // SYNCHRONIZED ->
- ::osl::ResettableMutexGuard aLock(m_aMutex);
-
- css::uno::Reference< css::frame::XTitle > xSubTitle(m_xSubTitle.get (), css::uno::UNO_QUERY);
-
- aLock.clear ();
- // <- SYNCHRONIZED
-
- if (xSubTitle.is ())
- return xSubTitle->getTitle ();
-
- return ::rtl::OUString ();
-}
-
-//-----------------------------------------------
::rtl::OUString TitleHelper::impl_convertURL2Title(const ::rtl::OUString& sURL)
{
INetURLObject aURL (sURL);
diff --git a/svx/inc/svx/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx
index 2dd14e8..70828d3 100755
--- a/svx/inc/svx/xoutbmp.hxx
+++ b/svx/inc/svx/xoutbmp.hxx
@@ -66,18 +66,11 @@ public:
static GraphicFilter* pGrfFilter;
- static BitmapEx CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
- const MapMode& rMapMode, const Size& rLogSize,
- const Point& rPoint, const Size& rSize );
static Graphic MirrorGraphic( const Graphic& rGraphic, const sal_uIntPtr nMirrorFlags );
static Animation MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr );
static sal_uInt16 WriteGraphic( const Graphic& rGraphic, String& rFileName,
const String& rFilterName, const sal_uIntPtr nFlags = 0L,
const Size* pMtfSize_100TH_MM = NULL );
- static void DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
- const Size& rSize, const BitmapEx& rBmpEx );
- static void DrawTiledBitmapEx( OutputDevice* pOutDev, const Point& rStartPt, const Size& rGrfSize,
- const Rectangle& rTileRect, const BitmapEx& rBmpEx );
static sal_uInt16 ExportGraphic( const Graphic& rGraphic, const INetURLObject& rURL,
GraphicFilter& rFilter, const sal_uInt16 nFormat,
diff --git a/svx/inc/svx/xsflclit.hxx b/svx/inc/svx/xsflclit.hxx
index 8ac2b15..23c7dfd 100644
--- a/svx/inc/svx/xsflclit.hxx
+++ b/svx/inc/svx/xsflclit.hxx
@@ -39,7 +39,6 @@ class SVX_DLLPUBLIC XSecondaryFillColorItem : public XColorItem
public:
TYPEINFO();
SVX_DLLPRIVATE XSecondaryFillColorItem() {}
- SVX_DLLPRIVATE XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor);
XSecondaryFillColorItem(const String& rName, const Color& rTheColor);
SVX_DLLPRIVATE XSecondaryFillColorItem(SvStream& rIn);
diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx
index e88e5e4..c125176 100755
--- a/svx/source/xoutdev/_xoutbmp.cxx
+++ b/svx/source/xoutdev/_xoutbmp.cxx
@@ -58,186 +58,6 @@
GraphicFilter* XOutBitmap::pGrfFilter = NULL;
-// -----------------------------------------------------------------------------
-
-BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
- const MapMode& rMapMode, const Size& rLogSize,
- const Point& rPoint, const Size& rSize )
-{
- BitmapEx aRetBmp;
-
- if( rGraphic.IsAlpha() )
- aRetBmp = rGraphic.GetBitmapEx();
- else
- {
- VirtualDevice aVDev( rCompDev );
- MapMode aMap( rMapMode );
-
- aMap.SetOrigin( Point() );
- aVDev.SetMapMode( aMap );
-
- Point aPoint( aVDev.LogicToPixel( rPoint ) );
- Size aOldSize( aVDev.LogicToPixel( rSize ) );
- Size aAbsSize( aOldSize );
- Size aQSizePix( aVDev.LogicToPixel( rLogSize ) );
-
- aVDev.SetMapMode( MapMode() );
-
- if( aOldSize.Width() < 0 )
- aAbsSize.Width() = -aAbsSize.Width();
-
- if( aOldSize.Height() < 0 )
- aAbsSize.Height() = -aAbsSize.Height();
-
- if( aVDev.SetOutputSizePixel( aAbsSize ) )
- {
- Point aNewOrg( -aPoint.X(), -aPoint.Y() );
- const Point aNullPoint;
-
- // horizontale Spiegelung ggf. beruecksichtigen
- if( aOldSize.Width() < 0 )
- {
- aNewOrg.X() -= aOldSize.Width();
-
- // und jetzt noch einen abziehen
- aNewOrg.X()--;
- }
-
- // vertikale Spiegelung ggf. beruecksichtigen
- if( rSize.Height() < 0 )
- {
- aNewOrg.Y() -= aOldSize.Height();
-
- // und jetzt noch einen abziehen
- aNewOrg.Y()--;
- }
-
- if( rGraphic.GetType() != GRAPHIC_BITMAP )
- {
- rGraphic.Draw( &aVDev, aNewOrg, aQSizePix );
-
- const Bitmap aBmp( aVDev.GetBitmap( aNullPoint, aAbsSize ) );
- Bitmap aMask;
-
- Graphic( rGraphic.GetGDIMetaFile().GetMonochromeMtf( COL_BLACK ) ).Draw( &aVDev, aNewOrg, aQSizePix );
- aMask = aVDev.GetBitmap( aNullPoint, aAbsSize );
- aRetBmp = BitmapEx( aBmp, aMask );
- }
- else
- {
- Bitmap aBmp( rGraphic.GetBitmap() );
-
-// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
-#ifdef UNX
- const Size aBmpSize( aBmp.GetSizePixel() );
- sal_Bool bFullTrans = sal_False;
-
- if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
- {
- Bitmap aTrans( rGraphic.GetBitmapEx().GetMask() );
- BitmapReadAccess* pMAcc = aBmp.AcquireReadAccess();
-
- if( pMAcc )
- {
- if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
- bFullTrans = sal_True;
-
- aTrans.ReleaseAccess( pMAcc );
- }
- }
-
- if( !bFullTrans )
-#endif // UNX
-
- {
- DitherBitmap( aBmp );
- aVDev.DrawBitmap( aNewOrg, aQSizePix, aBmp );
- aBmp = aVDev.GetBitmap( aNullPoint, aAbsSize );
-
- if( !rGraphic.IsTransparent() )
- aRetBmp = BitmapEx( aBmp );
- else
- {
- Bitmap aTrans( rGraphic.GetBitmapEx().GetMask() );
-
- if( !aTrans )
- aRetBmp = BitmapEx( aBmp, rGraphic.GetBitmapEx().GetTransparentColor() );
- else
- {
- aVDev.DrawBitmap( aNewOrg, aQSizePix, aTrans );
- aRetBmp = BitmapEx( aBmp, aVDev.GetBitmap( Point(), aAbsSize ) );
- }
- }
- }
- }
- }
- }
-
- return aRetBmp;
-}
-
-// ------------------------------------------------------------------------
-
-void XOutBitmap::DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
- const Size& rSize, const BitmapEx& rBmpEx )
-{
- const Size aBmpSizePix( rBmpEx.GetSizePixel() );
- const Size aSizePix( pOutDev->LogicToPixel( rSize ) );
-
- if ( ( aSizePix.Width() - aBmpSizePix.Width() ) || ( aSizePix.Height() - aBmpSizePix.Height() ) )
- rBmpEx.Draw( pOutDev, rPt, rSize );
- else
- rBmpEx.Draw( pOutDev, rPt );
-}
-
-// ------------------------------------------------------------------------
-
-void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
- const Point& rStartPt, const Size& rGrfSize,
- const Rectangle& rTileRect, const BitmapEx& rBmpEx )
-{
- Rectangle aClipRect( pOutDev->LogicToPixel( pOutDev->GetClipRegion().GetBoundRect() ) );
- Rectangle aPixRect( pOutDev->LogicToPixel( rTileRect ) );
- const Size aPixSize( pOutDev->LogicToPixel( rGrfSize ) );
- const Point aPixPoint( pOutDev->LogicToPixel( rStartPt ) );
- Point aOrg;
- const long nWidth = aPixSize.Width();
- const long nHeight = aPixSize.Height();
- long nXPos = aPixPoint.X() + ( ( aPixRect.Left() - aPixPoint.X() ) / nWidth ) * nWidth;
- long nYPos = aPixPoint.Y() + ( ( aPixRect.Top() - aPixPoint.Y() ) / nHeight ) * nHeight;
- const long nBottom = aPixRect.Bottom();
- const long nRight = aPixRect.Right();
- const long nLeft = nXPos;
- const sal_Bool bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
-
- pOutDev->Push();
- pOutDev->SetMapMode( MapMode() );
-
- // ggf. neue ClipRegion berechnen und setzen
- if ( pOutDev->IsClipRegion() )
- aPixRect.Intersection( aClipRect );
-
- pOutDev->SetClipRegion( aPixRect );
-
- while( nYPos <= nBottom )
- {
- while( nXPos <= nRight )
- {
- if ( bNoSize )
- rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ) );
- else
- rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ), aPixSize );
-
- nXPos += nWidth;
- }
-
- nXPos = nLeft;
- nYPos += nHeight;
- }
-
- pOutDev->Pop();
-}
-
// ------------------------------------------------------------------------
Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index b37320b..8f49069 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -3069,11 +3069,6 @@ bool XFillColorItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8
// -----------------------------
TYPEINIT1_AUTOFACTORY(XSecondaryFillColorItem, XColorItem);
-XSecondaryFillColorItem::XSecondaryFillColorItem(sal_Int32 nIndex, const Color& rTheColor) :
- XColorItem(XATTR_SECONDARYFILLCOLOR, nIndex, rTheColor)
-{
-}
-
XSecondaryFillColorItem::XSecondaryFillColorItem(const XubString& rName, const Color& rTheColor) :
XColorItem(XATTR_SECONDARYFILLCOLOR, rName, rTheColor)
{
diff --git a/xmloff/inc/xmloff/txtimp.hxx b/xmloff/inc/xmloff/txtimp.hxx
index 1896ef2..7a863e4 100644
--- a/xmloff/inc/xmloff/txtimp.hxx
+++ b/xmloff/inc/xmloff/txtimp.hxx
@@ -560,14 +560,11 @@ public:
UniReference< SvXMLImportPropertyMapper > const&
GetTextImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
- GetFrameImportPropertySetMapper() const;
- UniReference< SvXMLImportPropertyMapper > const&
GetSectionImportPropertySetMapper() const;
UniReference< SvXMLImportPropertyMapper > const&
GetRubyImportPropertySetMapper() const;
static SvXMLImportPropertyMapper *CreateShapeExtPropMapper(SvXMLImport&);
- static SvXMLImportPropertyMapper *CreateCharExtPropMapper(SvXMLImport&, XMLFontStylesContext *pFontDecls = NULL);
static SvXMLImportPropertyMapper *CreateParaExtPropMapper(SvXMLImport&, XMLFontStylesContext *pFontDecls = NULL);
static SvXMLImportPropertyMapper* CreateParaDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
static SvXMLImportPropertyMapper* CreateTableDefaultExtPropMapper(SvXMLImport&, XMLFontStylesContext* pFontDecls = NULL);
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index d5faddd..4468c05 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -748,12 +748,6 @@ XMLTextImportHelper::GetTextImportPropertySetMapper() const
}
UniReference< SvXMLImportPropertyMapper > const&
-XMLTextImportHelper::GetFrameImportPropertySetMapper() const
-{
- return m_pImpl->m_xFrameImpPrMap;
-}
-
-UniReference< SvXMLImportPropertyMapper > const&
XMLTextImportHelper::GetSectionImportPropertySetMapper() const
{
return m_pImpl->m_xSectionImpPrMap;
@@ -1078,15 +1072,6 @@ SvXMLImportPropertyMapper *XMLTextImportHelper::CreateShapeExtPropMapper(SvXMLIm
const_cast<XMLFontStylesContext*>(rImport.GetFontDecls()) );
}
-SvXMLImportPropertyMapper *XMLTextImportHelper::CreateCharExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext *pFontDecls)
-{
- XMLPropertySetMapper *pPropMapper =
- new XMLTextPropertySetMapper( TEXT_PROP_MAP_TEXT );
- if (!pFontDecls)
- pFontDecls = const_cast<XMLFontStylesContext*>(rImport.GetFontDecls());
- return new XMLTextImportPropertyMapper( pPropMapper, rImport, pFontDecls );
-}
-
SvXMLImportPropertyMapper *XMLTextImportHelper::CreateParaExtPropMapper(SvXMLImport& rImport, XMLFontStylesContext *pFontDecls)
{
XMLPropertySetMapper *pPropMapper =
commit 3e6613964f10ff10b71188293a2e4d4d1b29944c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:48:15 2011 +0100
callcatcher: remove unused methods
diff --git a/svx/inc/svx/svdotext.hxx b/svx/inc/svx/svdotext.hxx
index 2dd5774..9f54b9b 100644
--- a/svx/inc/svx/svdotext.hxx
+++ b/svx/inc/svx/svdotext.hxx
@@ -315,8 +315,6 @@ protected:
SdrTextObj(SdrObjKind eNewTextKind);
SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect);
- // der sal_uInt16 eFormat nimmt Werte des enum EETextFormat entgegen
- SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat);
virtual ~SdrTextObj();
public:
diff --git a/svx/inc/svx/xpoly.hxx b/svx/inc/svx/xpoly.hxx
index 25a57c9..7e77167 100644
--- a/svx/inc/svx/xpoly.hxx
+++ b/svx/inc/svx/xpoly.hxx
@@ -122,7 +122,6 @@ public:
// Transformationen
void Translate(const Point& rTrans);
- void Rotate(const Point& rCenter, double fSin, double fCos);
void Scale(double fSx, double fSy);
void Distort(const Rectangle& rRefRect, const XPolygon& rDistortedRect);
diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index b6d2d1c..c7222a9 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -198,34 +198,6 @@ SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect)
mbSupportTextIndentingOnLineWidthChange = sal_True;
}
-SdrTextObj::SdrTextObj(SdrObjKind eNewTextKind, const Rectangle& rNewRect, SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat)
-: SdrAttrObj(),
- aRect(rNewRect),
- mpText(NULL),
- pEdtOutl(NULL),
- pFormTextBoundRect(NULL),
- eTextKind(eNewTextKind)
-{
- bTextSizeDirty=sal_False;
- bTextFrame=sal_True;
- bNoShear=sal_True;
- bNoRotate=sal_False;
- bNoMirror=sal_True;
- bDisableAutoWidthOnDragging=sal_False;
- ImpJustifyRect(aRect);
-
- NbcSetText(rInput, rBaseURL, eFormat);
-
- mbInEditMode = sal_False;
- mbTextHidden = sal_False;
- mbTextAnimationAllowed = sal_True;
- mbInDownScale = sal_False;
- maTextEditOffset = Point(0, 0);
-
- // #i25616#
- mbSupportTextIndentingOnLineWidthChange = sal_True;
-}
-
SdrTextObj::~SdrTextObj()
{
if( pModel )
diff --git a/svx/source/xoutdev/_xpoly.cxx b/svx/source/xoutdev/_xpoly.cxx
index 0a40750..0c9d7a2 100644
--- a/svx/source/xoutdev/_xpoly.cxx
+++ b/svx/source/xoutdev/_xpoly.cxx
@@ -1004,55 +1004,6 @@ void XPolygon::PointsToBezier(sal_uInt16 nFirst)
/*************************************************************************
|*
-|* XPolygon::Rotate()
-|*
-|* Alle Punkte um den Punkt rCenter drehen, Sinus und Cosinus
-|* muessen uebergeben werden
-|*
-*************************************************************************/
-
-void XPolygon::Rotate(const Point& rCenter, double fSin, double fCos)
-{
- pImpXPolygon->CheckPointDelete();
- CheckReference();
-
- long nX;
- long nY;
- long nNewX;
- long nNewY;
- long nCenterX = rCenter.X();
- long nCenterY = rCenter.Y();
-
- sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
-
- for (sal_uInt16 i = 0; i < nPntCnt; i++)
- {
- Point *pPt = &(pImpXPolygon->pPointAry[i]);
- nX = pPt->X()-nCenterX;
- nY = pPt->Y()-nCenterY;
- nNewX = (long)floor(fCos * nX + fSin * nY + 0.5);
- nNewY = -(long)floor(fSin * nX - fCos * nY + 0.5);
- pPt->X() = nNewX + nCenterX;
- pPt->Y() = nNewY + nCenterY;
-
- /* und so stand das in einem anderen File auf T:
- dass ich am 29-11-1995 gegettet habe. Joe M.
- sal_uInt16 nPntCnt = pImpXPolygon->nPoints;
-
- for (sal_uInt16 i = 0; i < nPntCnt; i++)
- {
- Point P = pImpXPolygon->pPointAry[i] - rCenter;
- long X = P.X();
- long Y = P.Y();
- P.X() = (long)floor(fCos * X + fSin * Y + 0.5);
- P.Y() = -(long)floor(fSin * X - fCos * Y + 0.5);
- pImpXPolygon->pPointAry[i] = P + rCenter;
- */
- }
-}
-
-/*************************************************************************
-|*
|* XPolygon::Scale()
|*
|* XPolygon in X- und/oder Y-Richtung skalieren
commit 135a208ba217d9b8ff13f47eab552c8ddfaec01a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:47:38 2011 +0100
callcatcher: object is never constructed
diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx
index f1f0e2b..e58212b 100644
--- a/svx/inc/svx/svdmodel.hxx
+++ b/svx/inc/svx/svdmodel.hxx
@@ -82,7 +82,6 @@ class XBitmapList;
class XBitmapTable;
class XColorTable;
class XDashList;
-class XDashTable;
class XGradientList;
class XGradientTable;
class XHatchList;
diff --git a/svx/inc/svx/xattr.hxx b/svx/inc/svx/xattr.hxx
index 81e0251..a2118dc 100644
--- a/svx/inc/svx/xattr.hxx
+++ b/svx/inc/svx/xattr.hxx
@@ -29,7 +29,6 @@
#define _XATTR_HXX
class XColorTable;
-class XDashTable;
class XLineEndTable;
class XHatchTable;
class XBitmapTable;
diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx
index 2458a04..1611736 100644
--- a/svx/inc/svx/xit.hxx
+++ b/svx/inc/svx/xit.hxx
@@ -36,7 +36,6 @@
/************************************************************************/
class XColorTable;
-class XDashTable;
class XLineEndTable;
class XHatchTable;
class XBitmapTable;
diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx
index e5a465e..6617207 100644
--- a/svx/inc/svx/xlineit.hxx
+++ b/svx/inc/svx/xlineit.hxx
@@ -37,7 +37,6 @@
#include <svl/eitem.hxx>
class XDash;
-class XDashTable;
class SvStream;
#include <svx/xdash.hxx>
diff --git a/svx/inc/svx/xlndsit.hxx b/svx/inc/svx/xlndsit.hxx
index d3a6b17..4f61e37 100644
--- a/svx/inc/svx/xlndsit.hxx
+++ b/svx/inc/svx/xlndsit.hxx
@@ -68,7 +68,7 @@ public:
virtual bool HasMetrics() const;
virtual bool ScaleMetrics(long nMul, long nDiv);
- const XDash& GetDashValue(const XDashTable* pTable = 0) const; // GetValue -> GetDashValue
+ const XDash& GetDashValue() const;
void SetDashValue(const XDash& rNew) { aDash = rNew; Detach(); } // SetValue -> SetDashValue
static sal_Bool CompareValueFunc( const NameOrIndex* p1, const NameOrIndex* p2 );
diff --git a/svx/inc/svx/xtable.hxx b/svx/inc/svx/xtable.hxx
index 8224b61..5ed7a78 100644
--- a/svx/inc/svx/xtable.hxx
+++ b/svx/inc/svx/xtable.hxx
@@ -388,35 +388,6 @@ public:
virtual Bitmap* CreateBitmapForUI(long nIndex, sal_Bool bDelete = sal_True);
};
-// --------------------
-// class XDashTable
-// --------------------
-
-class XDashTable : public XPropertyTable
-{
-public:
- explicit XDashTable(
- const String& rPath,
- XOutdevItemPool* pXPool = NULL,
- sal_uInt16 nInitSize = 16,
- sal_uInt16 nReSize = 16
- );
- virtual ~XDashTable();
-
- using XPropertyTable::Replace;
- XDashEntry* Replace(long nIndex, XDashEntry* pEntry );
- using XPropertyTable::Remove;
- XDashEntry* Remove(long nIndex);
- using XPropertyTable::Get;
- XDashEntry* GetDash(long nIndex) const;
-
- virtual sal_Bool Load();
- virtual sal_Bool Save();
- virtual sal_Bool Create();
- virtual sal_Bool CreateBitmapsForUI();
- virtual Bitmap* CreateBitmapForUI( long nIndex, sal_Bool bDelete = sal_True );
-};
-
// -------------------
// class XDashList
// -------------------
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4c77a87..b37320b 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -960,16 +960,13 @@ SvStream& XLineDashItem::Store( SvStream& rOut, sal_uInt16 nItemVersion ) const
/*************************************************************************
|*
-|* const XDash& XLineDashItem::GetValue(const XDashTable* pTable) const
+|* const XDash& XLineDashItem::GetValue() const
|*
*************************************************************************/
-const XDash& XLineDashItem::GetDashValue(const XDashTable* pTable) const // GetValue -> GetDashValue
+const XDash& XLineDashItem::GetDashValue() const
{
- if (!IsIndex())
- return aDash;
- else
- return pTable->GetDash(GetIndex())->GetDash();
+ return aDash;
}
//------------------------------------------------------------------------
diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx
index 39034d4..d4b9b78 100644
--- a/svx/source/xoutdev/xtabdash.cxx
+++ b/svx/source/xoutdev/xtabdash.cxx
@@ -69,92 +69,6 @@ using ::rtl::OUString;
#define GLOBALOVERFLOW
sal_Unicode const pszExtDash[] = {'s','o','d'};
-char const aChckDash[] = { 0x04, 0x00, 'S','O','D','L'}; // < 5.2
-char const aChckDash0[] = { 0x04, 0x00, 'S','O','D','0'}; // = 5.2
-char const aChckXML[] = { '<', '?', 'x', 'm', 'l' }; // = 6.0
-
-// -----------------
-// class XDashTable
-// -----------------
-
-/*************************************************************************
-|*
-|* XDashTable::XDashTable()
-|*
-*************************************************************************/
-
-XDashTable::XDashTable(
- const String& rPath,
- XOutdevItemPool* pInPool,
- sal_uInt16 nInitSize,
- sal_uInt16 nReSize
-) :
- XPropertyTable( rPath, pInPool, nInitSize, nReSize )
-{
- pBmpTable = new Table( nInitSize, nReSize );
-}
-
-/************************************************************************/
-
-XDashTable::~XDashTable()
-{
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::Replace(long nIndex, XDashEntry* pEntry )
-{
- return (XDashEntry*) XPropertyTable::Replace(nIndex, pEntry);
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::Remove(long nIndex)
-{
- return (XDashEntry*) XPropertyTable::Remove(nIndex);
-}
-
-/************************************************************************/
-
-XDashEntry* XDashTable::GetDash(long nIndex) const
-{
- return (XDashEntry*) XPropertyTable::Get(nIndex, 0);
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Load()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Save()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::Create()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-sal_Bool XDashTable::CreateBitmapsForUI()
-{
- return( sal_False );
-}
-
-/************************************************************************/
-
-Bitmap* XDashTable::CreateBitmapForUI( long /*nIndex*/, sal_Bool /*bDelete*/)
-{
- return( NULL );
-}
// ----------------
// class XDashList
commit 71b8b49170a949ed51ef0dfbb3daf9f0257ff3f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:47:01 2011 +0100
callcatcher: object is never constructed
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index ba43d77..60ee099 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -68,15 +68,6 @@ XEditAttribute* MakeXEditAttribute( SfxItemPool& rPool, const SfxPoolItem& rItem
return pNew;
}
-
-XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr )
-{
- DBG_CTOR( XEditAttribute, 0 );
- pItem = &rAttr;
- nStart = 0;
- nEnd = 0;
-}
-
XEditAttribute::XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nS, sal_uInt16 nE )
{
DBG_CTOR( XEditAttribute, 0 );
diff --git a/editeng/source/editeng/editobj2.hxx b/editeng/source/editeng/editobj2.hxx
index 38b5300..4b07d10 100644
--- a/editeng/source/editeng/editobj2.hxx
+++ b/editeng/source/editeng/editobj2.hxx
@@ -53,7 +53,6 @@ private:
~XEditAttribute();
public:
- XEditAttribute( const SfxPoolItem& rAttr );
XEditAttribute( const SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd );
const SfxPoolItem* GetItem() const { return pItem; }
commit 000a453ef2e19315e0b3f7bd3c53f043fa9245b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 01:27:40 2011 +0100
ByteString::ConvertToUnicode->rtl::OUString::ctor::toChar
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index fa75702..ba43d77 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1286,7 +1286,10 @@ void BinTextObject::CreateData( SvStream& rIStream )
{
if ( pItem->Which() == EE_FEATURE_NOTCONV )
{
- pC->GetText().SetChar( nStart, ByteString::ConvertToUnicode( aByteString.GetChar( nStart ), ((SvxCharSetColorItem*)pItem)->GetCharSet() ) );
+ sal_Char cEncodedChar = aByteString.GetChar(nStart);
+ sal_Unicode cChar = rtl::OUString(&cEncodedChar, 1,
+ ((SvxCharSetColorItem*)pItem)->GetCharSet()).toChar();
+ pC->GetText().SetChar(nStart, cChar);
}
else
{
commit 4cab499c00e9183a3c5be758b56725529c2bde50
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Aug 7 00:29:46 2011 +0100
explicitly call XDesktop::terminate on early "restart" exit
Too many things create an XDesktop and too many things depend on it explicitly
having terminate called on it to allow the office on early-restart after
updating extensions to exit without config items etc not getting flushed.
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index ad3f0ba..9f3ac9e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1605,6 +1605,7 @@ int Desktop::Main()
Reference< XMultiServiceFactory > xSMgr =
::comphelper::getProcessServiceFactory();
+ Reference< XDesktop > xDesktop;
Reference< ::com::sun::star::task::XRestartManager > xRestartManager;
try
{
@@ -1698,6 +1699,9 @@ int Desktop::Main()
SvtPathOptions().SetWorkPath( aWorkPath );
}
+ xDesktop = Reference<XDesktop>( xSMgr->createInstance(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+
// create service for loadin SFX (still needed in startup)
pExecGlobals->xGlobalBroadcaster = Reference < css::document::XEventListener >
( xSMgr->createInstance(
@@ -1781,7 +1785,7 @@ int Desktop::Main()
(!Application::AnyInput( INPUT_APPEVENT ) ))
{
RTL_LOGFILE_CONTEXT_TRACE( aLog, "{ create BackingComponent" );
- Reference< XFrame > xDesktopFrame( xSMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
+ Reference< XFrame > xDesktopFrame( xDesktop, UNO_QUERY );
if (xDesktopFrame.is())
{
SetSplashScreenProgress(60);
@@ -1861,8 +1865,6 @@ int Desktop::Main()
RTL_LOGFILE_CONTEXT( aLog2, "desktop (cd100003) createInstance com.sun.star.frame.Desktop" );
try
{
- Reference< XDesktop > xDesktop( xSMgr->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY );
if ( xDesktop.is() )
xDesktop->addTerminateListener( new OfficeIPCThreadController );
SetSplashScreenProgress(100);
@@ -1923,6 +1925,11 @@ int Desktop::Main()
FatalError( MakeStartupErrorMessage(exAnyCfg.Message) );
}
}
+ else
+ {
+ if (xDesktop.is())
+ xDesktop->terminate();
+ }
// CAUTION: you do not necessarily get here e.g. on the Mac.
// please put all deinitialization code into doShutdown
return doShutdown();
commit a1316a5d3a2446a4271717b0c3ea54699349158c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 6 22:41:18 2011 +0100
why create a com.sun.star.util.PathSubstitution and not use it
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index fc3be7f..465993c 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -546,7 +546,6 @@ install_info MigrationImpl::findInstallation(const strings_v& rVersions)
install_info aInfo;
strings_v::const_iterator i_ver = rVersions.begin();
- uno::Reference < util::XStringSubstitution > xSubst( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.util.PathSubstitution"))), uno::UNO_QUERY );
while (i_ver != rVersions.end())
{
::rtl::OUString aVersion, aProfileName;
commit 8cd21316bafbcf70f4c5cef3a173e639e9bdcd66
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:45:24 2011 +0100
complete and utter nonsense
Taking the address of the pCheck argument in LoadEnvListener ctor gives the
address of the temporary on the stack/register itself, not the address of
LoadEnv's m_pCheck which is apparently what it thinks it's doing.
All that can be said about m_ppCheck is deferencing it inside the ctor will
give the value of pCheck for the duration of the ctor. What happens later on
in subsequent method calls is pot luck, storing it and deferencing it later is
meaningless.
Presumably this worked because it's rare for the dereferenced m_ppCheck to end
up containing 0 at the wrong time. Right now in a debugging build the mail
merge dialog from print... when there are form fields in a document and "print
form field" is selected triggers a 0 in there post construction at some stage
or other, causing the dialog to never appear as the loading here never
completes.
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index f2f3b3f..0408fb7 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -223,9 +223,6 @@ class LoadEnv : private ThreadHelpBase
*/
ActionLockGuard m_aTargetLock;
- /** TODO document me ... */
- void* m_pCheck;
-
QuietInteraction* m_pQuietInteraction;
//___________________________________________
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 784f6f7..a746211 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -117,17 +117,16 @@ class LoadEnvListener : private ThreadHelpBase
{
private:
- void** m_ppCheck ;
+ bool m_bWaitingResult;
LoadEnv* m_pLoadEnv;
public:
//_______________________________________
- LoadEnvListener(void* pCheck ,
- LoadEnv* pLoadEnv)
+ LoadEnvListener(LoadEnv* pLoadEnv)
+ : m_bWaitingResult(true)
+ , m_pLoadEnv(pLoadEnv)
{
- m_ppCheck = &pCheck ;
- m_pLoadEnv = pLoadEnv;
}
//_______________________________________
@@ -154,7 +153,6 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& x
throw(LoadEnvException, css::uno::RuntimeException)
: ThreadHelpBase( )
, m_xSMGR (xSMGR)
- , m_pCheck (this )
, m_pQuietInteraction( 0 )
{
}
@@ -162,7 +160,6 @@ LoadEnv::LoadEnv(const css::uno::Reference< css::lang::XMultiServiceFactory >& x
LoadEnv::~LoadEnv()
{
- m_pCheck = 0;
}
@@ -537,9 +534,9 @@ void SAL_CALL LoadEnvListener::loadFinished(const css::uno::Reference< css::fram
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
- if (m_ppCheck && *m_ppCheck)
+ if (m_bWaitingResult)
m_pLoadEnv->impl_setResult(sal_True);
- m_ppCheck = NULL;
+ m_bWaitingResult = false;
aWriteLock.unlock();
// <- SAFE ----------------------------------
@@ -552,9 +549,9 @@ void SAL_CALL LoadEnvListener::loadCancelled(const css::uno::Reference< css::fra
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
- if (m_ppCheck && *m_ppCheck)
+ if (m_bWaitingResult)
m_pLoadEnv->impl_setResult(sal_False);
- m_ppCheck = NULL;
+ m_bWaitingResult = false;
aWriteLock.unlock();
// <- SAFE ----------------------------------
@@ -567,7 +564,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
- if (!m_ppCheck || !*m_ppCheck)
+ if (!m_bWaitingResult)
return;
switch(aEvent.State)
@@ -584,7 +581,7 @@ void SAL_CALL LoadEnvListener::dispatchFinished(const css::frame::DispatchResult
m_pLoadEnv->impl_setResult(sal_False);
break;
}
- m_ppCheck = NULL;
+ m_bWaitingResult = false;
aWriteLock.unlock();
// <- SAFE ----------------------------------
@@ -597,9 +594,9 @@ void SAL_CALL LoadEnvListener::disposing(const css::lang::EventObject&)
// SAFE -> ----------------------------------
WriteGuard aWriteLock(m_aLock);
- if (m_ppCheck && *m_ppCheck)
+ if (m_bWaitingResult)
m_pLoadEnv->impl_setResult(sal_False);
- m_ppCheck = NULL;
+ m_bWaitingResult = false;
aWriteLock.unlock();
// <- SAFE ----------------------------------
@@ -928,8 +925,7 @@ sal_Bool LoadEnv::impl_handleContent()
// SAFE -> -----------------------------------
WriteGuard aWriteLock(m_aLock);
m_xAsynchronousJob = xHandler;
- m_pCheck = this;
- LoadEnvListener* pListener = new LoadEnvListener(m_pCheck, this);
+ LoadEnvListener* pListener = new LoadEnvListener(this);
aWriteLock.unlock();
// <- SAFE -----------------------------------
@@ -1136,8 +1132,7 @@ sal_Bool LoadEnv::impl_loadContent()
// SAFE -> -----------------------------------
aWriteLock.lock();
m_xAsynchronousJob = xAsyncLoader;
- m_pCheck = this;
- LoadEnvListener* pListener = new LoadEnvListener(m_pCheck, this);
+ LoadEnvListener* pListener = new LoadEnvListener(this);
aWriteLock.unlock();
// <- SAFE -----------------------------------
commit 4daff1ace2931012901a994d1b4dbff3eaea6e00
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:44:37 2011 +0100
runtime ConvertToUnicode->compile time unicode
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 0b934cd..d36fbab 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -219,17 +219,15 @@ void SvxRTFParser::NextToken( int nToken )
case RTF_TAB: cCh = '\t'; goto INSINGLECHAR;
case RTF_SUBENTRYINDEX: cCh = ':'; goto INSINGLECHAR;
- case RTF_EMDASH: cCh = 151; goto INSINGLECHAR;
- case RTF_ENDASH: cCh = 150; goto INSINGLECHAR;
- case RTF_BULLET: cCh = 149; goto INSINGLECHAR;
- case RTF_LQUOTE: cCh = 145; goto INSINGLECHAR;
- case RTF_RQUOTE: cCh = 146; goto INSINGLECHAR;
- case RTF_LDBLQUOTE: cCh = 147; goto INSINGLECHAR;
- case RTF_RDBLQUOTE: cCh = 148; goto INSINGLECHAR;
+ case RTF_EMDASH: cCh = 0x2014; goto INSINGLECHAR;
+ case RTF_ENDASH: cCh = 0x2013; goto INSINGLECHAR;
+ case RTF_BULLET: cCh = 0x2022; goto INSINGLECHAR;
+ case RTF_LQUOTE: cCh = 0x2018; goto INSINGLECHAR;
+ case RTF_RQUOTE: cCh = 0x2019; goto INSINGLECHAR;
+ case RTF_LDBLQUOTE: cCh = 0x201C; goto INSINGLECHAR;
+ case RTF_RDBLQUOTE: cCh = 0x201D; goto INSINGLECHAR;
INSINGLECHAR:
- aToken = ByteString::ConvertToUnicode( (sal_Char)cCh,
- RTL_TEXTENCODING_MS_1252 );
-
+ aToken = rtl::OUString(cCh);
// no Break, aToken is set as Text
case RTF_TEXTTOKEN:
{
commit 39ab5402171c8739cd578e073bcd29bb9bf9bdef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Aug 8 11:43:16 2011 +0100
callcatcher: remove various unused methods
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx
index d1381fb..d2a0e0f 100644
--- a/lotuswordpro/source/filter/bencont.cxx
+++ b/lotuswordpro/source/filter/bencont.cxx
@@ -382,92 +382,6 @@ sal_uInt32 GetSvStreamSize(SvStream * pStream)
return ulLength;
}
-/**
-* Find hazily according to part of property name
-* @date 01/31/2005
-* @param
-* @return the value stream pointers vector with the property names
-*/
-BenError LtcBenContainer::CreateGraphicStreams(std::vector<SvStream *> * pStreamVector)
-{
- /* traverse all named objects to find all the graphic property names */
- CBenObject * pObj= NULL;
- char *pName;
- std::vector<std::string> aGrPropertyVector ;
- while( (pObj = GetNextObject(pObj)) )
- {
- if(pObj->IsNamedObject())
- {
- CBenNamedObject * pNamedObj = static_cast<CBenNamedObject *>(pObj);
- if(!pNamedObj->IsPropertyName())
- continue;
-
- // Gr2E,41FDD458-S
- // Gr2E,41FDD458-D
- pName = const_cast<char *>(pNamedObj->GetName());
- if ( (pName[0] == 'G')
- && (pName[1] == 'r')
- &&( (pName[14] == 'D') || (pName[14] == 'S') ) )
- {
- aGrPropertyVector.push_back(std::string(pName));
- }
- }
- }
-
- /* traverse the found properties and construct the stream vectors */
- std::vector<std::string>::iterator itor;
- for (itor = aGrPropertyVector.begin(); itor != aGrPropertyVector.end(); ++itor)
- {
- // get property names with suffix of S&D
- char sSName[32], sDName[32];
- strcpy(sSName, itor->c_str());
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list