[Libreoffice-commits] .: comphelper/source dtrans/source i18npool/source l10ntools/layout l10ntools/source padmin/source rsc/source sax/source sot/source svl/inc svl/source svtools/inc svtools/source toolkit/source toolkit/workben tools/inc tools/source ucbhelper/source ucbhelper/workben unotools/source vcl/aqua vcl/inc vcl/os2 vcl/source vcl/unx vcl/win vcl/workben vos/inc
Michael Meeks
mmeeks at kemper.freedesktop.org
Mon Oct 18 08:53:14 PDT 2010
comphelper/source/eventattachermgr/eventattachermgr.cxx | 26
dtrans/source/os2/clipb/Os2Clipboard.cxx | 20
dtrans/source/test/test_dtrans.cxx | 13
i18npool/source/calendar/calendar_gregorian.cxx | 11
i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx | 29
i18npool/source/localedata/localedata.cxx | 7
i18npool/source/transliteration/data/numberchar.h | 71 -
i18npool/source/transliteration/transliteration_body.cxx | 113 -
i18npool/source/transliteration/transliteration_caseignore.cxx | 14
l10ntools/layout/tralay.cxx | 4
l10ntools/source/export.cxx | 12
l10ntools/source/help/HelpLinker.cxx | 19
padmin/source/fontentry.cxx | 86 -
rsc/source/rscpp/cpp6.c | 6
sax/source/tools/converter.cxx | 199 ---
sot/source/sdstor/ucbstorage.cxx | 25
svl/inc/cntnrsrt.hxx | 6
svl/inc/svl/poolitem.hxx | 58
svl/inc/svl/svarray.hxx | 6
svl/inc/svl/svdde.hxx | 11
svl/inc/svl/svstdarr.hxx | 6
svl/inc/svl/zforlist.hxx | 4
svl/source/items/itemset.cxx | 67 -
svl/source/items/poolitem.cxx | 83 -
svl/source/numbers/zforfind.cxx | 23
svtools/inc/svtools/brwbox.hxx | 1
svtools/inc/svtools/ehdl.hxx | 2
svtools/inc/svtools/filter.hxx | 4
svtools/inc/svtools/imap.hxx | 3
svtools/inc/svtools/svlbox.hxx | 8
svtools/inc/svtools/treelist.hxx | 4
svtools/inc/svtools/unitconv.hxx | 44
svtools/source/brwbox/brwbox1.cxx | 18
svtools/source/contnr/imivctl1.cxx | 23
svtools/source/contnr/svimpbox.cxx | 9
svtools/source/control/ctrltool.cxx | 26
svtools/source/control/valueset.cxx | 10
svtools/source/misc/embedhlp.cxx | 9
svtools/source/productregistration/registrationdlg.cxx | 5
svtools/source/svrtf/parrtf.cxx | 7
toolkit/source/awt/vclxtabcontrol.cxx | 22
toolkit/source/awt/vclxtabpage.cxx | 14
toolkit/source/awt/vclxtopwindow.cxx | 10
toolkit/source/layout/core/container.cxx | 41
toolkit/source/layout/core/helper.cxx | 69 -
toolkit/source/layout/core/import.hxx | 48
toolkit/source/layout/core/proplist.cxx | 25
toolkit/source/layout/core/root.cxx | 18
toolkit/source/layout/vcl/wrapper.cxx | 63 -
toolkit/workben/layout/editor.cxx | 96 -
toolkit/workben/layout/zoom.cxx | 10
tools/inc/tools/fsys.hxx | 4
tools/inc/tools/poly.hxx | 6
tools/inc/tools/pstm.hxx | 4
tools/inc/tools/ref.hxx | 2
tools/inc/tools/resary.hxx | 2
tools/inc/tools/table.hxx | 2
tools/source/fsys/dirent.cxx | 16
tools/source/fsys/os2.cxx | 129 --
tools/source/inet/inetmsg.cxx | 7
tools/source/stream/strmos2.cxx | 178 ---
ucbhelper/source/provider/resultsetmetadata.cxx | 21
ucbhelper/workben/myucp/myucp_content.cxx | 39
ucbhelper/workben/myucp/myucp_provider.cxx | 14
ucbhelper/workben/ucbexplorer/ucbexplorer.cxx | 6
unotools/source/accessibility/accessiblestatesethelper.cxx | 22
unotools/source/config/internaloptions.cxx | 37
unotools/source/config/pathoptions.cxx | 14
unotools/source/i18n/localedatawrapper.cxx | 5
vcl/aqua/source/gdi/salatslayout.cxx | 111 -
vcl/aqua/source/gdi/salatsuifontutils.cxx | 69 -
vcl/aqua/source/gdi/salgdi.cxx | 32
vcl/aqua/source/gdi/salnativewidgets.cxx | 4
vcl/aqua/source/gdi/salprn.cxx | 6
vcl/aqua/source/window/salframe.cxx | 6
vcl/inc/vcl/accel.hxx | 2
vcl/inc/vcl/animate.hxx | 2
vcl/inc/vcl/bitmap.hxx | 3
vcl/inc/vcl/bitmapex.hxx | 3
vcl/inc/vcl/bmpacc.hxx | 5
vcl/inc/vcl/combobox.hxx | 2
vcl/inc/vcl/ctrl.hxx | 2
vcl/inc/vcl/cursor.hxx | 2
vcl/inc/vcl/cvtgrf.hxx | 2
vcl/inc/vcl/cvtsvm.hxx | 2
vcl/inc/vcl/dialog.hxx | 6
vcl/inc/vcl/dockwin.hxx | 2
vcl/inc/vcl/evntpost.hxx | 2
vcl/inc/vcl/fixed.hxx | 2
vcl/inc/vcl/floatwin.hxx | 2
vcl/inc/vcl/gdimtf.hxx | 5
vcl/inc/vcl/graph.hxx | 4
vcl/inc/vcl/impprn.hxx | 141 --
vcl/inc/vcl/jobset.hxx | 2
vcl/inc/vcl/longcurr.hxx | 2
vcl/inc/vcl/lstbox.hxx | 2
vcl/inc/vcl/menu.hxx | 2
vcl/inc/vcl/octree.hxx | 3
vcl/inc/vcl/salbtype.hxx | 4
vcl/inc/vcl/seleng.hxx | 2
vcl/inc/vcl/status.hxx | 2
vcl/inc/vcl/taskpanelist.hxx | 2
vcl/inc/vcl/toolbox.hxx | 4
vcl/inc/vcl/wall.hxx | 3
vcl/inc/vcl/window.hxx | 4
vcl/os2/inc/salgdi.h | 15
vcl/os2/inc/sallayout.h | 38
vcl/os2/source/app/salinfo.cxx | 17
vcl/os2/source/app/sallang.cxx | 44
vcl/os2/source/gdi/os2layout.cxx | 9
vcl/os2/source/gdi/salgdi.cxx | 101 -
vcl/os2/source/gdi/salgdi3.cxx | 62 -
vcl/os2/source/gdi/salprn.cxx | 17
vcl/os2/source/window/salframe.cxx | 111 -
vcl/os2/source/window/salobj.cxx | 12
vcl/source/control/tabctrl.cxx | 21
vcl/source/fontsubset/cff.cxx | 42
vcl/source/fontsubset/fontsubset.cxx | 4
vcl/source/fontsubset/sft.cxx | 48
vcl/source/fontsubset/ttcr.cxx | 13
vcl/source/gdi/bmpfast.cxx | 57
vcl/source/gdi/cvtsvm.cxx | 5
vcl/source/gdi/impprn.cxx | 587 ----------
vcl/source/gdi/metric.cxx | 7
vcl/source/gdi/outdev.cxx | 23
vcl/source/gdi/outdev6.cxx | 9
vcl/source/gdi/outdevnative.cxx | 37
vcl/source/gdi/pdfwriter_impl.cxx | 44
vcl/source/gdi/pngread.cxx | 5
vcl/source/gdi/sallayout.cxx | 68 -
vcl/source/glyphs/gcach_ftyp.cxx | 16
vcl/source/glyphs/gcach_layout.cxx | 11
vcl/source/glyphs/glyphcache.cxx | 6
vcl/source/window/printdlg.cxx | 21
vcl/unx/gtk/a11y/atkwrapper.cxx | 7
vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 52
vcl/unx/kde4/KDESalGraphics.cxx | 70 -
vcl/unx/source/dtrans/X11_selection.cxx | 10
vcl/unx/source/fontmanager/fontconfig.cxx | 8
vcl/unx/source/fontmanager/fontmanager.cxx | 9
vcl/unx/source/fontmanager/parseAFM.cxx | 89 -
vcl/unx/source/gdi/pspgraphics.cxx | 8
vcl/unx/source/gdi/salgdi.cxx | 19
vcl/unx/source/gdi/salgdi2.cxx | 15
vcl/unx/source/gdi/salgdi3.cxx | 4
vcl/unx/source/gdi/xfont.cxx | 16
vcl/unx/source/gdi/xrender_peer.cxx | 6
vcl/unx/source/gdi/xrender_peer.hxx | 10
vcl/win/source/gdi/salgdi3.cxx | 17
vcl/win/source/gdi/winlayout.cxx | 5
vcl/workben/svptest.cxx | 8
vos/inc/vos/module.hxx | 6
152 files changed, 27 insertions(+), 4247 deletions(-)
New commits:
commit 6831e22e068397899f26f40da92e5ca5aee35cda
Author: Povilas Kanapickas <povilas.kanapickas at gmail.com>
Date: Mon Oct 18 16:52:05 2010 +0100
remove non-compiled code
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 98a65f3..16ba676 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -95,32 +95,6 @@ struct AttacherIndex_Impl
bool operator==( const AttacherIndex_Impl & ) const;
};
-#if 0
-bool AttachedObject_Impl::operator<( const AttachedObject_Impl & r ) const
-{
- OSL_ENSURE( FALSE, "not implemented" );
- return FALSE;
- return this < &r;
-}
-
-bool AttachedObject_Impl::operator==( const AttachedObject_Impl & r ) const
-{
- OSL_ENSURE( FALSE, "not implemented" );
- return this == &r;
-}
-
-bool AttacherIndex_Impl::operator<( const AttacherIndex_Impl & r ) const
-{
- OSL_ENSURE( FALSE, "not implemented" );
- return this < &r;
-}
-bool AttacherIndex_Impl::operator==( const AttacherIndex_Impl & r ) const
-{
- OSL_ENSURE( FALSE, "not implemented" );
- return this == &r;
-}
-#endif
-
//-----------------------------------------------------------------------------
class ImplEventAttacherManager
: public WeakImplHelper2< XEventAttacherManager, XPersistObject >
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index 623110c..a43570b 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.cxx
@@ -110,26 +110,6 @@ Os2Clipboard::Os2Clipboard() :
hText = 0;
hBitmap = 0;
-#if 0
- // register object class
- if ( WinRegisterClass( hAB, (PSZ)DTRANS_OBJ_CLASSNAME,
- (PFNWP)DtransObjWndProc, 0, sizeof(ULONG) ))
- {
- APIRET rc;
- // create object window to get clip viewer messages
- hObjWnd = WinCreateWindow( HWND_OBJECT, (PCSZ)DTRANS_OBJ_CLASSNAME,
- (PCSZ)"", 0, 0, 0, 0, 0,
- HWND_OBJECT, HWND_TOP,
- 222, NULL, NULL);
- // store pointer
- SetWindowPtr( hObjWnd, this);
- // register the viewer window
- rc = WinOpenClipbrd(hAB);
- rc = WinSetClipbrdViewer(hAB, hObjWnd);
- rc = WinCloseClipbrd(hAB);
- }
-#endif
-
}
Os2Clipboard::~Os2Clipboard()
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 69b0234..ae10c4d 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.cxx
@@ -267,19 +267,6 @@ Any SAL_CALL StringTransferable::getTransferData( const DataFlavor& aFlavor )
{
anyData = makeAny( m_Data );
} */
-#if 0
- else if ( aFlavor == m_seqDFlv[0] )
- {
- OString aStr( m_Data.getStr( ), m_Data.getLength( ), 1252 );
- Sequence< sal_Int8 > sOfChars( aStr.getLength( ) );
- sal_Int32 lenStr = aStr.getLength( );
-
- for ( sal_Int32 i = 0; i < lenStr; ++i )
- sOfChars[i] = aStr[i];
-
- anyData = makeAny( sOfChars );
- }
-#endif
return anyData;
}
diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index e92be76..abdda18 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -171,17 +171,6 @@ Calendar_gregorian::init(Era *_eraArray)
UErrorCode status;
body = icu::Calendar::createInstance( aIcuLocale, status = U_ZERO_ERROR);
if (!body || !U_SUCCESS(status)) throw ERROR;
-
-#if 0
- {
- icu::Locale loc;
- loc = body->getLocale( ULOC_ACTUAL_LOCALE, status = U_ZERO_ERROR);
- fprintf( stderr, "\nICU calendar actual locale: %s\n", loc.getName());
- loc = body->getLocale( ULOC_VALID_LOCALE, status = U_ZERO_ERROR);
- fprintf( stderr, "ICU calendar valid locale: %s\n", loc.getName());
- }
-#endif
-
eraArray=_eraArray;
}
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index e213a6d..65cd795 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -260,35 +260,6 @@ OUString toRoman( sal_Int32 n )
}
// not used:
-#if 0
-
-static
-const char* expected_name( int i, int last )
-{
- if(0);
- else if( i==0 ) return "Prefix";
- else if( i==1 ) return "NumberingType";
- else if( i==2 ) return "Suffix";
- else if( i==last ) return "Value";
- else { OSL_ASSERT(0); return ""; }
-}
-static
-const char* expected_type( int i, int last )
-{
- if(0);
- else if( i==0 ) return "OUString";
- else if( i==1 ) return "sal_Int16";
- else if( i==2 ) return "OUString";
- else if( i==last ) return "sal_Int32";
- else { OSL_ASSERT(0); return ""; }
-}
-static
-void failedToConvert( int i, int last )
-{
- throw IllegalArgumentException();
-}
-
-#endif
static
void lcl_formatChars( sal_Unicode table[], int tableSize, int n, OUString& s )
diff --git a/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 8ab412f..52c4eb0 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -675,14 +675,9 @@ LocaleData::getAllFormats( const Locale& rLocale ) throw(RuntimeException)
}
} section[SECTIONS];
-#if 0
-// #i79398# wntmsci10 MSVC doesn't get this right with optimization.
- const sal_Int32 formatCount = section[0].getFunc( *this, rLocale, "getAllFormats0")
- + section[1].getFunc( *this, rLocale, "getAllFormats1");
-#else
sal_Int32 formatCount = section[0].getFunc( *this, rLocale, "getAllFormats0");
formatCount += section[1].getFunc( *this, rLocale, "getAllFormats1");
-#endif
+
Sequence< FormatElement > seq(formatCount);
sal_Int32 f = 0;
for (int s = 0; s < SECTIONS; ++s)
diff --git a/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h
index 6e6a441..1d1198a 100644
--- a/i18npool/source/transliteration/data/numberchar.h
+++ b/i18npool/source/transliteration/data/numberchar.h
@@ -63,46 +63,6 @@ static const sal_Unicode NumberChar[][10] = {
{ 0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57, 0x0E58, 0x0E59 } // Thai
};
-// not used
-#if 0
-static sal_Unicode DecimalChar[] = {
- 0x002E, // Half Width (Ascii)
- 0xFF0E, // Full Width
- 0xFF0E, // Chinese Lower
- 0x70B9, // S. Chinese Upper
- 0x9EDE, // T. Chinese Upper
- 0x30FB, // Japanese Modern
- 0x30FB, // Japanese Trad.
- 0xFF0E, // Korean Lower
- 0x9EDE, // Korean Upper
- 0xC810, // Korean Hangul
- 0x066B, // Arabic Indic
- 0x002E, // Est. Arabic Indic
- 0x002E, // Indic
- 0x002E // Thai
-};
-#endif
-
-// not used
-#if 0
-static sal_Unicode MinusChar[] = {
- 0x002D, // Half Width (Ascii)
- 0xFF0D, // Full Width
- 0xFF0D, // Chinese Lower
- 0x8D1F, // S. Chinese Upper
- 0x5069, // T. Chinese Upper
- 0x2212, // Japanese Modern
- 0x2212, // Japanese Trad.
- 0xFF0D, // Korean Lower
- 0x5069, // Korean Upper
- 0xFF0D, // Korean Hangul ???
- 0x002D, // Arabic Indic
- 0x002D, // Est. Arabic Indic
- 0x002D, // Indic
- 0x002D, // Thai
-};
-#endif
-
#define NUMBER_ZERO NumberChar[NumberChar_HalfWidth][0] // 0x0030
#define NUMBER_ONE NumberChar[NumberChar_HalfWidth][1] // 0x0031
#define NUMBER_NINE NumberChar[NumberChar_HalfWidth][9] // 0x0039
@@ -123,40 +83,9 @@ const sal_Int16 Multiplier_Count = 7;
const sal_Int16 ExponentCount_CJK = 6;
-// not used
-#if 0
-static sal_Int16 MultiplierExponent_CJK[ExponentCount_CJK] = {
- 12, 8, 4, 3, 2, 1
-};
-static sal_Unicode MultiplierChar_CJK[][ExponentCount_CJK] = {
- 0x5146, 0x4EBF, 0x4E07, 0x5343, 0x767E, 0x5341, // S. Chinese Lower
- 0x5146, 0x4EBF, 0x4E07, 0x4EDF, 0x4F70, 0x62FE, // S. Chinese Upper
- 0x5146, 0x5104, 0x842C, 0x5343, 0x767E, 0x5341, // T. Chinese & Korean Lower
- 0x5146, 0x5104, 0x842C, 0x4EDF, 0x4F70, 0x62FE, // T. Chinese & Korean Upper
- 0xC870, 0xC5B5, 0xB9CC, 0xCC9C, 0xBC31, 0xC2ED, // Korean Hangul
- 0x5146, 0x5104, 0x4E07, 0x5343, 0x767E, 0x5341, // Japanese Modern
- 0x5146, 0x5104, 0x842C, 0x9621, 0x767E, 0x62FE, // Japanese Traditional
-};
-#endif
const sal_Int16 ExponentCount_short_CJK = 2;
-// not used
-#if 0
-static sal_Int16 MultiplierExponent_short_CJK[ExponentCount_short_CJK] = {
- 8, 4,
-};
-
-static sal_Unicode MultiplierChar_short_CJK[][ExponentCount_short_CJK] = {
- 0x4EBF, 0x4E07, // S. Chinese Lower
- 0x4EBF, 0x4E07, // S. Chinese Upper
- 0x5104, 0x842C, // T. Chinese & Korean Lower
- 0x5104, 0x842C, // T. Chinese & Korean Upper
- 0xC5B5, 0xB9CC, // Korean Hangul
- 0x5104, 0x4E07, // Japanese Modern
- 0x5104, 0x842C, // Japanese Traditional
-};
-#endif
} } } }
diff --git a/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index 7a04049..491932d 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -113,64 +113,7 @@ Transliteration_body::transliterate(
Sequence< sal_Int32 >& offset)
throw(RuntimeException)
{
-#if 0
-/* Performance optimization:
- * The two realloc() consume 48% (32% grow, 16% shrink) runtime of this method!
- * getValue() needs about 15%, so there is equal balance if we trade the second
- * (shrinking) realloc() for a getValue(). But if the caller initializes the
- * sequence to nCount elements there isn't any change in size necessary in most
- * cases (one-to-one mapping) and we gain 33%.
- *
- * Of that constellation the getValue() method takes 20% upon each call, so 40%
- * for both. By remembering the first calls' results we could gain some extra
- * percentage again, but unfortunately getValue() may return a reference to a
- * static buffer, so we can't store the pointer directly but would have to
- * copy-construct an array, which doesn't give us any advantage.
- *
- * Much more is accomplished by working directly on the sequence buffer
- * returned by getArray() instead of using operator[] for each and every
- * access.
- *
- * And while we're at it: now that we know the size in advance we don't need to
- * copy the buffer anymore, just create the real string buffer and let the
- * return value take ownership.
- *
- * All together these changes result in the new implementation needing only 62%
- * of the time of the old implementation (in other words: that one was 1.61
- * times slower ...)
- */
-
- // Allocate the max possible buffer. Try to use stack instead of heap which
- // would have to be reallocated most times anyway.
- const sal_Int32 nLocalBuf = 512 * NMAPPINGMAX;
- sal_Unicode aLocalBuf[nLocalBuf], *out = aLocalBuf, *aHeapBuf = NULL;
-
- const sal_Unicode *in = inStr.getStr() + startPos;
- if (nCount > 512)
- out = aHeapBuf = (sal_Unicode*) malloc((nCount * NMAPPINGMAX) * sizeof(sal_Unicode));
-
- if (useOffset)
- offset.realloc(nCount * NMAPPINGMAX);
- sal_Int32 j = 0;
- for (sal_Int32 i = 0; i < nCount; i++) {
- Mapping &map = casefolding::getValue(in, i, nCount, aLocale, nMappingType);
- for (sal_Int32 k = 0; k < map.nmap; k++) {
- if (useOffset)
- offset[j] = i + startPos;
- out[j++] = map.map[k];
- }
- }
- if (useOffset)
- offset.realloc(j);
-
- OUString r(out, j);
-
- if (aHeapBuf)
- free(aHeapBuf);
-
- return r;
-#else
const sal_Unicode *in = inStr.getStr() + startPos;
// Two different blocks to eliminate the if(useOffset) condition inside the
@@ -252,7 +195,6 @@ Transliteration_body::transliterate(
delete [] pHeapBuf;
return aRet;
}
-#endif
}
OUString SAL_CALL
@@ -332,61 +274,6 @@ Transliteration_titlecase::Transliteration_titlecase()
implementationName = "com.sun.star.i18n.Transliteration.Transliteration_titlecase";
}
-#if 0
-struct LigatureData
-{
- sal_uInt32 cChar;
- sal_Char * pUtf8Text;
-};
-
-// available Unicode ligatures:
-// http://www.unicode.org/charts
-// http://www.unicode.org/charts/PDF/UFB00.pdf
-static LigatureData aLigatures[] =
-{
- { 0x0FB00, "ff" },
- { 0x0FB01, "fi" },
- { 0x0FB02, "fl" },
- { 0x0FB03, "ffi" },
- { 0x0FB04, "ffl" },
- { 0x0FB05, "ft" },
- { 0x0FB06, "st" },
-
- { 0x0FB13, "\xD5\xB4\xD5\xB6" }, // Armenian small men now
- { 0x0FB14, "\xD5\xB4\xD5\xA5" }, // Armenian small men ech
- { 0x0FB15, "\xD5\xB4\xD5\xAB" }, // Armenian small men ini
- { 0x0FB16, "\xD5\xBE\xD5\xB6" }, // Armenian small vew now
- { 0x0FB17, "\xD5\xB4\xD5\xAD" }, // Armenian small men xeh
- { 0x00000, "" }
-};
-
-static inline bool lcl_IsLigature( sal_uInt32 cChar )
-{
- return (0x0FB00 <= cChar && cChar <= 0x0FB06) || (0x0FB13 <= cChar && cChar <= 0x0FB17);
-}
-
-static rtl::OUString lcl_ResolveLigature( sal_uInt32 cChar )
-{
- rtl::OUString aRes;
- if (lcl_IsLigature( cChar ))
- {
- LigatureData *pFound = NULL;
- LigatureData *pData = aLigatures;
- while (!pFound && pData->cChar != 0)
- {
- if (pData->cChar == cChar)
- pFound = pData;
- ++pData;
- }
- if (pFound)
- aRes = rtl::OUString( pFound->pUtf8Text, strlen( pFound->pUtf8Text ), RTL_TEXTENCODING_UTF8 );
- }
- else
- aRes = rtl::OUString( &cChar, 1 );
- return aRes;
-}
-#endif // if 0
-
static rtl::OUString transliterate_titlecase_Impl(
const OUString& inStr, sal_Int32 startPos, sal_Int32 nCount,
const Locale &rLocale,
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index 316ba89..29e3364 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -50,20 +50,6 @@ Transliteration_caseignore::Transliteration_caseignore()
implementationName = "com.sun.star.i18n.Transliteration.Transliteration_caseignore";
}
-#if 0
-/* NOTE: We had this, derived from Transliteration_caseignore, but it was
- * unused code. Deactivated with #i89580# but left for reference in case
- * MappingTypeSimpleFolding would be needed at some time.
- */
-Transliteration_simplecaseignore::Transliteration_simplecaseignore()
-{
- nMappingType = MappingTypeSimpleFolding;
- moduleLoaded = (TransliterationModules)0;
- transliterationName = "simple case ignore (generic)";
- implementationName = "com.sun.star.i18n.Transliteration.Transliteration_simplecaseignore";
-}
-#endif
-
void SAL_CALL
Transliteration_caseignore::loadModule( TransliterationModules modName, const Locale& rLocale )
throw(RuntimeException)
diff --git a/l10ntools/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index d1c3ec7..9ab3300 100644
--- a/l10ntools/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.cxx
@@ -204,11 +204,7 @@ translateElement( XMLElement* element, ByteString const& lang,
entry->GetText( translation, STRING_TYP_TEXT, lang, true );
// ByteString original = removeContent( element );
if ( !translation.Len() )
-#if 0
- translation = original;
-#else
translation = BSTRING( ( *i )->GetValue() );
-#endif
delete translateAttribute( attributes, **i , STRING( translation ) );
}
}
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index 805ea47..3f20370 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -621,13 +621,6 @@ int Export::Execute( int nToken, const char * pToken )
// cur. line has macro line end
ByteString sTmpLine( sToken );
sTmpLine.EraseAllChars( '\t' ); sTmpLine.EraseAllChars( ' ' );
- #if 0
- // impossible, unsigned is never negative
- if( sTmpLine.Len() < 0 ){
- if ( sTmpLine.GetChar(( USHORT )( sTmpLine.Len() - 1 )) != '\\' )
- bNextMustBeDefineEOL = TRUE;
- }
- #endif
}
}
}
@@ -1792,11 +1785,6 @@ void Export::WriteToMerged( const ByteString &rText , bool bSDFContent )
static ByteString RETURN ('\n');
//printf("%s\n",rText.GetBuffer() );
- #if 0
- // statement has no effect
- if( pParseQueue->bMflag && !bSDFContent ) pParseQueue->bMflag;
- #endif
-
if ( !bDontWriteOutput || !bUnmerge ) {
ByteString sText( rText );
while ( sText.SearchAndReplace( " \n", "\n" ) != STRING_NOTFOUND ) {};
diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 262beeb..649efc0 100644
--- a/l10ntools/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.cxx
@@ -292,18 +292,6 @@ private:
void addBookmark( DB* dbBase, FILE* pFile_DBHelp, std::string thishid,
const std::string& fileB, const std::string& anchorB,
const std::string& jarfileB, const std::string& titleB );
-#if 0
- /**
- * @param outputFile
- * @param module
- * @param lang
- * @param hid
- * @param helpFiles
- * @param additionalFiles
- */
-
- private HelpURLStreamHandlerFactory urlHandler = null;
-#endif
};
namespace URLEncoder
@@ -575,13 +563,6 @@ void HelpLinker::link() throw( HelpProcessingException )
if (documentTitle.empty())
documentTitle = "<notitle>";
-#if 0
- std::cout << "for " << xhpFileName << " documentBaseId is " << documentBaseId << "\n";
- std::cout << "for " << xhpFileName << " documentPath is " << documentPath << "\n";
- std::cout << "for " << xhpFileName << " documentJarfile is " << documentJarfile << "\n";
- std::cout << "for " << xhpFileName << " documentPath is " << documentTitle << "\n";
-#endif
-
const std::string& fileB = documentPath;
const std::string& jarfileB = documentJarfile;
std::string& titleB = documentTitle;
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index 7bb8e4b..edd48fc 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -43,92 +43,6 @@ using namespace osl;
using namespace rtl;
using namespace psp;
-#if 0
-static void CreateAfmFile( const INetURLObject& rFontFile )
-{
- rtl_TextEncoding aEncoding = gsl_getSystemTextEncoding();
-
- INetURLObject aFontMap( rFontFile.GetPath(), INET_PROT_FILE, INetURLObject::ENCODE_ALL );
- aFontMap.Append( String( RTL_CONSTASCII_USTRINGPARAM( "Fontmap" ) ) );
- INetURLObject aAfmFile( rFontFile );
- aAfmFile.setExtension( String::CreateFromAscii( "afm", 3 ) );
-
-
- SvFileStream aMap( aFontMap.PathToFileName(), STREAM_WRITE | STREAM_TRUNC );
- if( aMap.IsOpen() )
- {
- SvFileStream aRead( rFontFile.GetFull(), STREAM_READ );
- ByteString aLine;
- ByteString aFullName;
- int nPos;
- while( ! aRead.IsEof() &&
- ( nPos = aLine.Search( "/FullName" ) ) == STRING_NOTFOUND )
- aRead.ReadLine( aLine );
- aRead.Close();
- if( nPos != STRING_NOTFOUND )
- {
- aLine.Erase( 0, nPos );
- aFullName = aLine.GetToken( 1, '(' ).GetToken( 0, ')' );
-
- aLine = '/';
- aLine += aFullName;
- aLine += ' ';
- aLine += '(';
- aLine += ByteString( rFontFile.GetName(), aEncoding );
- aLine += ')';
- aLine += ';';
-
- aMap.WriteLine( aLine );
- }
- aMap.Close();
- pid_t nPID = fork();
- if( ! nPID )
- {
- INetURLObject aTmp( rFontFile );
- aTmp.CutName();
- ByteString aEnv( "GS_LIB=" );
- aEnv += ByteString( aTmp.PathToFileName(), aEncoding );
- putenv( const_cast<char*>(aEnv.GetBuffer()) );
-
- int nDescr = open( ByteString( aAfmFile.PathToFileName(), aEncoding ).GetBuffer(),
- O_CREAT | O_TRUNC| O_WRONLY,
- 00755 );
-#if OSL_DEBUG_LEVEL > 1
- if( nDescr < 0 )
- fprintf( stderr, "open( %s ) failed because of %d\n", ByteString( aAfmFile.GetFull(), aEncoding ).GetBuffer(), errno );
-#endif
- if( dup2( nDescr, STDOUT_FILENO ) > 0 )
- {
- execlp( "gs",
- "-q",
- "-dNODISPLAY",
- "--", "printafm.ps",
- aFullName.GetBuffer(),
- NULL );
- }
-#if OSL_DEBUG_LEVEL > 1
- else
- fprintf( stderr, "dup2( %d, %d ) failed because of %d\n", nDescr, STDOUT_FILENO, errno );
-#endif
- _exit( 0 );
- }
- if( nPID > 0 )
- waitpid( nPID, NULL, 0 );
- MetricConverter::ConvertAFM( aAfmFile );
- }
-
- struct stat aStat;
- ByteString aSysFile( aAfmFile.PathToFileName(), aEncoding );
- if( stat( aSysFile.GetBuffer(), &aStat ) || ! aStat.st_size )
- unlink( aSysFile.GetBuffer() );
-#if OSL_DEBUG_LEVEL > 1
- fprintf( stderr, " %s\n", ! access( aSysFile.GetBuffer(), F_OK ) ? "success" : "failed" );
-#endif
- unlink( ByteString( aFontMap.PathToFileName(), aEncoding ).GetBuffer() );
-}
-
-#endif
-
FontNameDlg::FontNameDlg( Window *pParent ) :
ModalDialog( pParent, PaResId( RID_FONTNAMEDIALOG ) ),
m_aOKButton( this, PaResId( RID_FNTNM_BTN_OK ) ),
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 1b6dc44..26a5adb 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -792,11 +792,7 @@ get_from_file:
if ((file = infile) == NULL)
return (EOF_CHAR);
newline:
-#if 0
- fprintf( pCppOut, "get(%s), recursion %d, line %d, bptr = %d, buffer \"%s\"\n",
- file->filename, recursion, line,
- file->bptr - file->buffer, file->buffer);
-#endif
+
/*
* Read a character from the current input line or macro.
* At EOS, either finish the current macro (freeing temp.
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index bd1d807..91f37b0 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -275,193 +275,6 @@ void Converter::convertMeasure( OUStringBuffer& rBuffer,
(void)nMeasure;
(void)nSourceUnit;
(void)nTargetUnit;
-#if 0
- if( nSourceUnit == MeasureUnit::PERCENT )
- {
- OSL_ENSURE( nTargetUnit == MeasureUnit::PERCENT,
- "MeasureUnit::PERCENT only maps to MeasureUnit::PERCENT!" );
-
- rBuffer.append( nMeasure );
- rBuffer.append( sal_Unicode('%' ) );
- }
- else
- {
- // the sign is processed seperatly
- if( nMeasure < 0 )
- {
- nMeasure = -nMeasure;
- rBuffer.append( sal_Unicode('-') );
- }
-
- // The new length is (nVal * nMul)/(nDiv*nFac*10)
- long nMul = 1000;
- long nDiv = 1;
- long nFac = 100;
- const sal_Char* psUnit = 0;
- switch( nSourceUnit )
- {
- case MeasureUnit::TWIP:
- switch( nTargetUnit )
- {
- case MeasureUnit::MM_100TH:
- case MeasureUnit::MM_10TH:
- OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,"output unit not supported for twip values" );
- case MeasureUnit::MM:
- // 0.01mm = 0.57twip (exactly)
- nMul = 25400; // 25.4 * 1000
- nDiv = 1440; // 72 * 20;
- nFac = 100;
- psUnit = gpsMM;
- break;
-
- case MeasureUnit::CM:
- // 0.001cm = 0.57twip (exactly)
- nMul = 25400; // 2.54 * 10000
- nDiv = 1440; // 72 * 20;
- nFac = 1000;
- psUnit = gpsCM;
- break;
-
- case MeasureUnit::POINT:
- // 0.01pt = 0.2twip (exactly)
- nMul = 1000;
- nDiv = 20;
- nFac = 100;
- psUnit = gpsPT;
- break;
-
- case MeasureUnit::INCH:
- default:
- OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,
- "output unit not supported for twip values" );
- // 0.0001in = 0.144twip (exactly)
- nMul = 100000;
- nDiv = 1440; // 72 * 20;
- nFac = 10000;
- psUnit = gpsINCH;
- break;
- }
- break;
-
- case MeasureUnit::POINT:
- // 1pt = 1pt (exactly)
- OSL_ENSURE( MeasureUnit::POINT == nTargetUnit,
- "output unit not supported for pt values" );
- nMul = 10;
- nDiv = 1;
- nFac = 1;
- psUnit = gpsPT;
- break;
- case MeasureUnit::MM_10TH:
- case MeasureUnit::MM_100TH:
- {
- long nFac2 = (MeasureUnit::MM_100TH == nSourceUnit) ? 100 : 10;
- switch( nTargetUnit )
- {
- case MeasureUnit::MM_100TH:
- case MeasureUnit::MM_10TH:
- OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,
- "output unit not supported for 1/100mm values" );
- case MeasureUnit::MM:
- // 0.01mm = 1 mm/100 (exactly)
- nMul = 10;
- nDiv = 1;
- nFac = nFac2;
- psUnit = gpsMM;
- break;
-
- case MeasureUnit::CM:
- // 0.001mm = 1 mm/100 (exactly)
- nMul = 10;
- nDiv = 1; // 72 * 20;
- nFac = 10*nFac2;
- psUnit = gpsCM;
- break;
-
- case MeasureUnit::POINT:
- // 0.01pt = 0.35 mm/100 (exactly)
- nMul = 72000;
- nDiv = 2540;
- nFac = nFac2;
- psUnit = gpsPT;
- break;
-
- case MeasureUnit::INCH:
- default:
- OSL_ENSURE( MeasureUnit::INCH == nTargetUnit,
- "output unit not supported for 1/100mm values" );
- // 0.0001in = 0.254 mm/100 (exactly)
- nMul = 100000;
- nDiv = 2540;
- nFac = 100*nFac2;
- psUnit = gpsINCH;
- break;
- }
- break;
- }
- }
-
- long nLongVal = 0;
- bool bOutLongVal = true;
- if( nMeasure > SAL_INT32_MAX / nMul )
- {
- // A big int is required for calculation
- BigInt nBigVal( nMeasure );
- BigInt nBigFac( nFac );
- nBigVal *= nMul;
- nBigVal /= nDiv;
- nBigVal += 5;
- nBigVal /= 10;
-
- if( nBigVal.IsLong() )
- {
- // To convert the value into a string a long is sufficient
- nLongVal = (long)nBigVal;
- }
- else
- {
- BigInt nBigFac2( nFac );
- BigInt nBig10( 10 );
- rBuffer.append( (sal_Int32)(nBigVal / nBigFac2) );
- if( !(nBigVal % nBigFac2).IsZero() )
- {
- rBuffer.append( sal_Unicode('.') );
- while( nFac > 1 && !(nBigVal % nBigFac2).IsZero() )
- {
- nFac /= 10;
- nBigFac2 = nFac;
- rBuffer.append( (sal_Int32)((nBigVal / nBigFac2) % nBig10 ) );
- }
- }
- bOutLongVal = false;
- }
- }
- else
- {
- nLongVal = nMeasure * nMul;
- nLongVal /= nDiv;
- nLongVal += 5;
- nLongVal /= 10;
- }
-
- if( bOutLongVal )
- {
- rBuffer.append( (sal_Int32)(nLongVal / nFac) );
- if( nFac > 1 && (nLongVal % nFac) != 0 )
- {
- rBuffer.append( sal_Unicode('.') );
- while( nFac > 1 && (nLongVal % nFac) != 0 )
- {
- nFac /= 10;
- rBuffer.append( (sal_Int32)((nLongVal / nFac) % 10) );
- }
- }
- }
-
- if( psUnit )
- rBuffer.appendAscii( psUnit );
- }
-#endif
}
static const OUString& getTrueString()
@@ -1496,13 +1309,6 @@ bool Converter::convertDateOrDateTime(
{
bSuccess = false; // only 24:00:00 is valid
}
-#if 0
- else
- {
- nHours = 0; // normalize 24:00:00 to 00:00:00 of next day
- lcl_addDay(bNegative, nYear, nMonth, nDay, 1);
- }
-#endif
}
}
@@ -1570,11 +1376,6 @@ bool Converter::convertDateOrDateTime(
if (bSuccess && bHaveTimezone)
{
// util::DateTime does not support timezones!
-#if 0
- // do not add timezone, just strip it (as suggested by er)
- lcl_addTimezone(bNegative, nYear, nMonth, nDay, nHours, nMinutes,
- !bHaveTimezoneMinus, nTimezoneHours, nTimezoneMinutes);
-#endif
}
if (bSuccess)
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index feb4be5..2eeda25 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.cxx
@@ -488,12 +488,6 @@ public:
ULONG ReadSourceWriteTemporary( ULONG aLength ); // read aLength from source and copy to temporary,
// no seeking is produced
ULONG ReadSourceWriteTemporary(); // read source till the end and copy to temporary,
- // no seeking is produced
-#if 0
- ULONG CopySourceToTemporary( ULONG aLength ); // same as ReadSourceWriteToTemporary( aLength )
- // but the writing is done at the end of temporary
- // pointer position is not changed
-#endif
ULONG CopySourceToTemporary(); // same as ReadSourceWriteToTemporary()
// but the writing is done at the end of temporary
@@ -991,25 +985,6 @@ ULONG UCBStorageStream_Impl::CopySourceToTemporary()
}
-#if 0
-ULONG UCBStorageStream_Impl::CopySourceToTemporary( ULONG aLength )
-{
- // current position of the temporary stream is not changed
- ULONG aResult = 0;
-
- if( m_bSourceRead )
- {
- ULONG aPos = m_pStream->Tell();
- m_pStream->Seek( STREAM_SEEK_TO_END );
- aResult = ReadSourceWriteTemporary( aLength );
- m_pStream->Seek( aPos );
- }
-
- return aResult;
-
-}
-#endif
-
// UCBStorageStream_Impl must have a SvStream interface, because it then can be used as underlying stream
// of an OLEStorage; so every write access caused by storage operations marks the UCBStorageStream as modified
ULONG UCBStorageStream_Impl::GetData( void* pData, ULONG nSize )
diff --git a/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 215b192..636fff1 100644
--- a/svl/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.hxx
@@ -28,8 +28,7 @@
#ifndef _CNTRSRT_HXX
#define _CNTRSRT_HXX
-#if 0
-***********************************************************************
+/***********************************************************************
*
* Hier folgt die Beschreibung fuer die exportierten Makros:
*
@@ -53,8 +52,7 @@
*
* Wie DECLARE_CONTAINER_SORT, nur dass beim Aufruf des Destruktors
* alle im Conatiner vorhandenen Objekte geloescht werden.
-*
-#endif
+*/
#include <tools/contnr.hxx>
diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 21fe8ca..5419791 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.hxx
@@ -196,12 +196,6 @@ private:
inline ULONG ReleaseRef( ULONG n = 1 ) const;
SVL_DLLPRIVATE long Delete_Impl(void*);
-#if 0
- // @@@ virtual, but private, and dummy impl. @@@
- virtual void Store( SvStream & ) const;
- virtual void GetVersion() const;
-#endif
-
protected:
SfxPoolItem( USHORT nWhich = 0 );
SfxPoolItem( const SfxPoolItem& );
@@ -413,38 +407,6 @@ public:
};
// -----------------------------------------------------------------------
-
-#if 0 /* @@@ NOT USED @@@ */
-class SfxInvalidItem: public SfxPoolItem
-{
-friend class SfxItemSet;
-
- const SfxPoolItem* pDefaultItem;
-
-private:
- TYPEINFO();
- SfxInvalidItem( USHORT nWhich, const SfxPoolItem &rDefault );
- SfxInvalidItem( const SfxInvalidItem& );
- virtual ~SfxInvalidItem();
-
-public:
- virtual int operator==( const SfxPoolItem& ) const;
-
- virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresMetric,
- XubString &rText,
- const IntlWrapper * = 0 ) const;
- const SfxPoolItem* GetDefaultItem() const { return pDefaultItem; }
-
- // von sich selbst eine Kopie erzeugen
- virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
- virtual SvStream& Store(SvStream &, USHORT nVer ) const;
-};
-#endif /* @@@ NOT USED @@@ */
-
-// -----------------------------------------------------------------------
// Handle Klasse fuer PoolItems
class SVL_DLLPUBLIC SfxItemHandle
@@ -466,26 +428,6 @@ DECL_PTRHINT(SVL_DLLPUBLIC, SfxPoolItemHint, SfxPoolItem);
// -----------------------------------------------------------------------
-#if 0 /* @@@ NOT USED @@@ */
-class SfxItemChangedHint: public SfxHint
-{
- const SfxPoolItem& _rOld;
- const SfxPoolItem& _rNew;
-
-public:
- TYPEINFO(); \
- SfxItemChangedHint( const SfxPoolItem &rOld,
- const SfxPoolItem &rNew )
- : _rOld( rOld ),
- _rNew( rNew )
- {}
-
- const SfxPoolItem& GetOldItem() const { return _rOld; }
- const SfxPoolItem& GetNewItem() const { return _rNew; }
-};
-
-#endif /* @@@ NOT USED @@@ */
-
#endif // #ifndef _SFXPOOLITEM_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 1d8de00..a627e0f 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.hxx
@@ -29,8 +29,7 @@
#ifndef _SVARRAY_HXX
#define _SVARRAY_HXX
-#if 0
-***********************************************************************
+/***********************************************************************
*
* Hier folgt die Beschreibung fuer die exportierten Makros:
*
@@ -96,8 +95,7 @@
* PtrArr: SvStrings, SvStringsDtor
* SortArr: SvStringsSort, SvStringsSortDtor,
* SvStringsISort, SvStringsISortDtor
-***********************************************************************
-#endif
+***********************************************************************/
#include "svl/svldllapi.h"
diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index a84013f..d5832e0 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.hxx
@@ -65,13 +65,9 @@ typedef List DdeTopics;
typedef List DdeItems;
#endif
-//#if 0 // _SOLAR__PRIVATE
DECLARE_LIST( DdeTransactions, DdeTransaction* )
DECLARE_LIST( DdeFormats, long )
-//#else
-//typedef List DdeTransactions;
-//typedef List DdeFormats;
-//#endif
+
#ifndef STRING_LIST
#define STRING_LIST
@@ -90,9 +86,8 @@ class SVL_DLLPUBLIC DdeData
friend class DdeTransaction;
DdeDataImp* pImp;
-//#if 0 // _SOLAR__PRIVATE
SVL_DLLPRIVATE void Lock();
-//#endif
+
void SetFormat( ULONG nFmt );
public:
@@ -139,9 +134,7 @@ class DdeTopicList
{
StringList aTopics;
-//#if 0 // _SOLAR__PRIVATE
DECL_LINK( Data, DdeData* );
-//#endif
public:
DdeTopicList( const String& );
~DdeTopicList();
diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index fdc31de..a016eb2 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.hxx
@@ -26,8 +26,7 @@
*
************************************************************************/
-#if 0
-***********************************************************************
+/***********************************************************************
*
* Die vordefinierte Arrays werden ueber POSITIV-Defines aktiviert:
* (die defines setzen sich aus "_SVSTDARR_" und dem Namen des Array
@@ -38,8 +37,7 @@
* SortArr: SvStringsSort, SvStringsSortDtor,
* SvStringsISort, SvStringsISortDtor,
* SvUShortsSort
-***********************************************************************
-#endif
+***********************************************************************/
#include "svl/svldllapi.h"
#include <svl/svarray.hxx>
diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 80a1adc..c2c46f1 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.hxx
@@ -211,9 +211,7 @@ enum NfEvalDateFormat
};
-//#if 0 // _SOLAR__PRIVATE
#define _ZFORLIST_DECLARE_TABLE
-//#endif
#ifdef _ZFORLIST_DECLARE_TABLE
DECLARE_TABLE (SvNumberFormatTable, SvNumberformat*)
DECLARE_TABLE (SvNumberFormatterIndexTable, sal_uInt32*)
@@ -244,12 +242,10 @@ class SVL_DLLPUBLIC NfCurrencyEntry
private:
-//#if 0 // _SOLAR__PRIVATE
// nDecimalFormat := 0, 1, 2
// #,##0 or #,##0.00 or #,##0.-- are assigned
SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&,
const LocaleDataWrapper&, USHORT nDecimalFormat ) const;
-//#endif // __PRIVATE
public:
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index f71d41f..83cc862 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -2040,73 +2040,6 @@ void SfxItemSet::DisableItem(USHORT nWhich)
// -----------------------------------------------------------------------
-#if 0
-BOOL SfxAllItemSet::Remove(USHORT nWhich)
-{
- DBG_CHKTHIS(SfxAllItemSet, 0);
- USHORT *pPtr = _pWhichRanges;
- USHORT nPos = 0;
- while( *pPtr )
- {
- if( *pPtr <= nWhich && nWhich <= *(pPtr+1) )
- {
- USHORT *pTmp = pPtr;
- USHORT nLeft = 0;
- USHORT nRest = 0;
- while(*++pTmp){
- if( nLeft & 1 )
- nRest = *pTmp - *(pTmp-1) + 1;
- ++nLeft;
- }
-
- // in diesem Bereich
- nPos += nWhich - *pPtr;
- nRest -= nWhich - *pPtr;
- // 3,3
- if(*pPtr == nWhich && *(pPtr+1) == nWhich) {
- memmove(pPtr, pPtr + 2, nLeft * sizeof(USHORT));
- nFree += 2;
- }
- // Anfang
- else if(*pPtr == nWhich)
- (*pPtr)++;
- // Ende
- else if(*(pPtr+1) == nWhich)
- (*(pPtr+1))--;
- else {
- if(nPos + nRest + 2 > nFree) {
- USHORT nOf = pPtr - _pWhichRanges;
- _pWhichRanges = IncrSize(_pWhichRanges, nPos + nRest, nInitCount);
- nFree += nInitCount;
- pPtr = _pWhichRanges + nOf;
- }
- memmove(pPtr +2, pPtr, (nLeft+2) * sizeof(USHORT));
- *++pPtr = nWhich-1;
- *++pPtr = nWhich+1;
- nFree -= 2;
- }
- SfxPoolItem* pItem = *( _aItems + nPos );
- if( pItem )
- {
- if(_pPool)
- _pPool->Remove(*pItem );
- else
- delete pItem;
- --_nCount;
- }
- memmove(_aItems + nPos +1, _aItems + nPos,
- sizeof(SfxPoolItem *) * (nRest - 1));
- break; // dann beim Parent suchen
- }
- nPos += *(pPtr+1) - *pPtr + 1;
- pPtr += 2;
- }
- return *pPtr? TRUE: FALSE;
-}
-#endif
-
-// -----------------------------------------------------------------------
-
SfxItemSet *SfxAllItemSet::Clone(BOOL bItems, SfxItemPool *pToPool ) const
{
DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 87dbe0d..a3e3b92 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.cxx
@@ -361,75 +361,6 @@ SfxPoolItem* SfxVoidItem::Clone(SfxItemPool *) const
}
// SfxInvalidItem ---------------------------------------------------------
-#if 0 /* @@@ NOT USED @@@ */
-SfxInvalidItem::SfxInvalidItem( USHORT nWhich, const SfxPoolItem &rDefault ):
- SfxPoolItem(nWhich),
- pDefaultItem(&rDefault)
-{
- DBG_CTOR(SfxInvalidItem, 0);
-}
-
-// ------------------------------------------------------------------------
-SfxInvalidItem::SfxInvalidItem( const SfxInvalidItem& rCopy):
- SfxPoolItem(rCopy),
- pDefaultItem(rCopy.pDefaultItem)
-{
- DBG_CTOR(SfxInvalidItem, 0);
- //! pDefaultItem->ReleaseRef?
-}
-
-// ------------------------------------------------------------------------
-SfxInvalidItem::~SfxInvalidItem()
-{
- DBG_DTOR(SfxInvalidItem, 0);
-}
-
-// ------------------------------------------------------------------------
-int SfxInvalidItem::operator==( const SfxPoolItem& rCmp) const
-{
- DBG_CHKTHIS(SfxInvalidItem, 0);
- DBG_ASSERT( SfxPoolItem::operator==(rCmp), "unequal type" );
- return *pDefaultItem == *((SfxInvalidItem&)rCmp).pDefaultItem;
-}
-
-// ------------------------------------------------------------------------
-SfxItemPresentation SfxInvalidItem::GetPresentation
-(
- SfxItemPresentation ePresentation,
- SfxMapUnit eCoreMetric,
- SfxMapUnit ePresentationMetric,
- XubString& rText,
- const IntlWrapper *
-) const
-{
- DBG_CHKTHIS(SfxInvalidItem, 0);
- rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("Invalid"));
- return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-// ------------------------------------------------------------------------
-SfxPoolItem* SfxInvalidItem::Clone(SfxItemPool *) const
-{
- DBG_CHKTHIS(SfxInvalidItem, 0);
- return new SfxInvalidItem(*this);
-}
-
-// ------------------------------------------------------------------------
-SfxPoolItem* SfxInvalidItem::Create(SvStream &, USHORT nVersion) const
-{
- DBG_CHKTHIS(SfxInvalidItem, 0);
- DBG_ERROR("SfxInvalidItem::Create() ist sinnlos");
- return Clone();
-}
-
-// ------------------------------------------------------------------------
-SvStream& SfxInvalidItem::Store(SvStream &rStream, USHORT nItemVersion ) const
-{
- DBG_CHKTHIS(SfxInvalidItem, 0);
- DBG_ERROR("SfxInvalidItem::Store() ist sinnlos");
- return rStream;
-}
-#endif /* @@@ NOT USED @@@ */
// SfxItemHandle ----------------------------------------------------------
SfxItemHandle::SfxItemHandle(SfxPoolItem &rItem):
@@ -490,20 +421,6 @@ bool SfxPoolItem::HasMetrics() const
}
// -----------------------------------------------------------------------
-#if 0 /* @@@ NOT USED @@@ */
-void SfxPoolItem::GetVersion() const
-{
- DBG_ERROR( "dummy called" );
-}
-
-// -----------------------------------------------------------------------
-void SfxPoolItem::Store(SvStream &rStream) const
-{
- DBG_ERROR( "dummy called" );
-}
-#endif /* @@@ NOT USED @@@ */
-
-// -----------------------------------------------------------------------
bool SfxPoolItem::QueryValue( com::sun::star::uno::Any&, BYTE ) const
{
diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index d20747f..017ef7d 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -116,17 +116,6 @@ ImpSvNumberInputScan::~ImpSvNumberInputScan()
void ImpSvNumberInputScan::Reset()
{
-#if 0
-// ER 16.06.97 18:56 Vorbelegung erfolgt jetzt in NumberStringDivision,
-// wozu immer alles loeschen wenn einiges wieder benutzt oder gar nicht
-// gebraucht wird..
- for (USHORT i = 0; i < SV_MAX_ANZ_INPUT_STRINGS; i++)
- {
- sStrArray[i].Erase();
- nNums[i] = SV_MAX_ANZ_INPUT_STRINGS-1;
- IsNum[i] = FALSE;
- }
-#endif
nMonth = 0;
nMonthPos = 0;
nTimePos = 0;
@@ -154,19 +143,7 @@ void ImpSvNumberInputScan::Reset()
// static
inline BOOL ImpSvNumberInputScan::MyIsdigit( sal_Unicode c )
{
- // If the input string wouldn't be converted using TransformInput() we'd
- // to use something similar to the following and to adapt many places.
-#if 0
- // use faster isdigit() if possible
- if ( c < 128 )
- return isdigit( (unsigned char) c ) != 0;
- if ( c < 256 )
- return FALSE;
- String aTmp( c );
- return pFormatter->GetCharClass()->isDigit( aTmp, 0 );
-#else
return c < 128 && isdigit( (unsigned char) c );
-#endif
}
diff --git a/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 902ca41..6dbaba2 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.hxx
@@ -310,7 +310,6 @@ class SVT_DLLPUBLIC BrowseBox
BrowserMode m_nCurrentMode; // last argument of SetMode (redundant, as our other members represent the current settings, too)
private:
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void ConstructImpl(BrowserMode nMode);
SVT_DLLPRIVATE void ExpandRowSelection( const BrowserMouseEvent& rEvt );
SVT_DLLPRIVATE void ToggleSelection( BOOL bForce = FALSE );
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index d4e7cac..1fd3cfe 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.hxx
@@ -74,9 +74,7 @@ private:
ResMgr *pMgr;
ResMgr *pFreeMgr;
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE BOOL GetClassString(ULONG lErrId, String &) const;
-//#endif
virtual BOOL CreateString(
const ErrorInfo *, String &, USHORT &) const;
};
diff --git a/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 06af4fc..492ed85 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.hxx
@@ -173,8 +173,6 @@ class SVT_DLLPUBLIC GraphicDescriptor
void ImpConstruct();
-//#if 0 // _SOLAR__PRIVATE
-
BOOL ImpDetectBMP( SvStream& rStm, BOOL bExtendedInfo );
BOOL ImpDetectGIF( SvStream& rStm, BOOL bExtendedInfo );
BOOL ImpDetectJPG( SvStream& rStm, BOOL bExtendedInfo );
@@ -200,8 +198,6 @@ class SVT_DLLPUBLIC GraphicDescriptor
BOOL ImpDetectSGV( SvStream& rStm, BOOL bExtendedInfo );
BOOL ImpDetectEMF( SvStream& rStm, BOOL bExtendedInfo );
-//#endif
-
GraphicDescriptor( const GraphicDescriptor& );
GraphicDescriptor& operator=( const GraphicDescriptor& );
diff --git a/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 330c4d2..f47b303 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.hxx
@@ -148,8 +148,6 @@ public:
|*
\******************************************************************************/
-//#if 0 // _SOLAR__PRIVATE
-
class IMapCompat
{
SvStream* pRWStm;
@@ -168,7 +166,6 @@ public:
~IMapCompat();
};
-//#endif // __PRIVATE
#endif // _IMAP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index 2fc418e..b247519 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.hxx
@@ -189,9 +189,7 @@ class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry
SvPtrarr aItems;
void* pUserData;
USHORT nEntryFlags;
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void DeleteItems_Impl();
-//#endif
public:
SvLBoxEntry();
@@ -265,7 +263,6 @@ class SVT_DLLPUBLIC SvLBox
{
friend class SvLBoxEntry;
-//#if 0 // _SOLAR__PRIVATE
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, SvInplaceEdit2 * );
// Handler, der von TreeList zum Clonen eines Entries aufgerufen wird
DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* );
@@ -279,7 +276,6 @@ class SVT_DLLPUBLIC SvLBox
SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvLBox& rB );
SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvLBox& rB );
DECL_DLLPRIVATE_STATIC_LINK( SvLBox, DragFinishHdl_Impl, sal_Int8* );
-//#endif
DragDropMode nOldDragMode;
@@ -593,12 +589,10 @@ class SvInplaceEdit : public Edit
BOOL bCanceled;
BOOL bAlreadyInCallBack;
-//#if 0 // _SOLAR__PRIVATE
void CallCallBackHdl_Impl();
DECL_LINK( Timeout_Impl, Timer * );
DECL_LINK( ReturnHdl_Impl, Accelerator * );
DECL_LINK( EscapeHdl_Impl, Accelerator * );
-//#endif
public:
SvInplaceEdit( Window* pParent, const Point& rPos, const Size& rSize,
@@ -624,12 +618,10 @@ class SvInplaceEdit2
BOOL bAlreadyInCallBack;
BOOL bMultiLine;
-//#if 0 // _SOLAR__PRIVATE
void CallCallBackHdl_Impl();
DECL_LINK( Timeout_Impl, Timer * );
DECL_LINK( ReturnHdl_Impl, Accelerator * );
DECL_LINK( EscapeHdl_Impl, Accelerator * );
-//#endif
public:
SvInplaceEdit2( Window* pParent, const Point& rPos, const Size& rSize,
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index 948f9d1..3b308dc 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -209,7 +209,6 @@ class SVT_DLLPUBLIC SvTreeList
void Expand( SvListView*,SvListEntry* pParent );
void Collapse( SvListView*,SvListEntry* pParent );
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void SetAbsolutePositions();
SVT_DLLPRIVATE SvTreeEntryList*CloneChilds( SvTreeEntryList* pChilds,
SvListEntry* pNewParent,
@@ -220,7 +219,6 @@ class SVT_DLLPUBLIC SvTreeList
SVT_DLLPRIVATE void GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
ULONG& rPos );
SVT_DLLPRIVATE void ResortChilds( SvListEntry* pParent );
-//#endif /* _SOLAR__PRIVATE */
protected:
@@ -318,11 +316,9 @@ class SVT_DLLPUBLIC SvListView
ULONG nSelectionCount;
BOOL bVisPositionsValid;
-//#if 0 // _SOLAR__PRIVATE
SVT_DLLPRIVATE void InitTable();
SVT_DLLPRIVATE void ClearTable();
SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
-//#endif
protected:
Table aDataTable; // Mapping SvListEntry -> ViewData
diff --git a/svtools/inc/svtools/unitconv.hxx b/svtools/inc/svtools/unitconv.hxx
index 516fd7e..c4630e9 100644
--- a/svtools/inc/svtools/unitconv.hxx
+++ b/svtools/inc/svtools/unitconv.hxx
@@ -64,50 +64,6 @@ SVT_DLLPUBLIC long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit )
SVT_DLLPUBLIC long PointToTwips( long nIn );
-#if 0
-// to Twips
-SVT_DLLPUBLIC long CMToTwips( long nIn );
-SVT_DLLPUBLIC long MMToTwips( long nIn );
-SVT_DLLPUBLIC long InchToTwips( long nIn );
-SVT_DLLPUBLIC long PicaToTwips( long nIn );
-
-// to CM
-SVT_DLLPUBLIC long TwipsToCM( long nIn );
-SVT_DLLPUBLIC long InchToCM( long nIn );
-SVT_DLLPUBLIC long MMToCM( long nIn );
-SVT_DLLPUBLIC long PointToCM( long nIn );
-SVT_DLLPUBLIC long PicaToCM( long nIn );
-
-// to MM
-SVT_DLLPUBLIC long TwipsToMM( long nIn );
-SVT_DLLPUBLIC long CMToMM( long nIn );
-SVT_DLLPUBLIC long InchToMM( long nIn );
-SVT_DLLPUBLIC long PointToMM( long nIn );
-SVT_DLLPUBLIC long PicaToMM( long nIn );
-
-// to Inch
-SVT_DLLPUBLIC long TwipsToInch(long nIn );
-SVT_DLLPUBLIC long CMToInch(long nIn );
-SVT_DLLPUBLIC long MMToInch(long nIn );
-SVT_DLLPUBLIC long PointToInch(long nIn );
-SVT_DLLPUBLIC long PicaToInch(long nIn );
-
-// to Point
-SVT_DLLPUBLIC long TwipsToPoint(long nIn );
-SVT_DLLPUBLIC long InchToPoint(long nIn );
-SVT_DLLPUBLIC long CMToPoint(long nIn );
-SVT_DLLPUBLIC long MMToPoint(long nIn );
-SVT_DLLPUBLIC long PicaToPoint(long nIn );
-
-// To Pica
-long TwipsToPica(long nIn );
-long InchToPica(long nIn );
-long PointToPica(long nIn );
-long CMToPica(long nIn );
-long MMToPica(long nIn );
-
-#endif
-
SVT_DLLPUBLIC long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
#endif
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index be6eea6..ea459da 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -716,14 +716,6 @@ void BrowseBox::SetColumnWidth( USHORT nItemId, ULONG nWidth )
// Breite setzen
pCols->GetObject(nItemPos)->SetWidth(nWidth, GetZoom());
-#if 0
- if ( nItemPos != pCols->Count() - 1 )
- {
- long nLastColMaxWidth = pDataWin->GetSizePixel().Width() -
- GetFieldRect(GetColumnId(pCols->Count()-1)).Left();
- pCols->GetObject(pCols->Count()-1)->Width() = nLastColMaxWidth;
- }
-#endif
// scroll and invalidate
if ( bUpdate )
@@ -1314,16 +1306,6 @@ void BrowseBox::RowInserted( long nRow, long nNumRows, BOOL bDoPaint, BOOL bKeep
if ( nNumRows <= 0 )
return;
-#if 0
- // Zerlegung in einzelne RowInserted-Aufrufe:
- if (nNumRows > 1)
- {
- for (long i = 0; i < nNumRows; i++)
- RowInserted(nRow + i,1,bDoPaint);
- return;
- }
-#endif
-
// adjust total row count
BOOL bLastRow = nRow >= nRowCount;
nRowCount += nNumRows;
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index e49d09f..58b1fdb 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -1065,16 +1065,14 @@ BOOL SvxIconChoiceCtrl_Impl::MouseButtonUp( const MouseEvent& rMEvt )
pCurHighlightFrame = 0; // Neues painten des Frames erzwingen
bHighlightFramePressed = FALSE;
SetEntryHighlightFrame( pEntry, TRUE );
-#if 0
- CallSelectHandler( pCurHighlightFrame );
-#else
+
pHdlEntry = pCurHighlightFrame;
pView->ClickIcon();
// set focus on Icon
SvxIconChoiceCtrlEntry* pOldCursor = pCursor;
SetCursor_Impl( pOldCursor, pHdlEntry, FALSE, FALSE, TRUE );
-#endif
+
pHdlEntry = 0;
}
return bHandled;
@@ -1307,23 +1305,6 @@ BOOL SvxIconChoiceCtrl_Impl::KeyInput( const KeyEvent& rKEvt )
}
break;
-// wird vom VCL-Tracking gesteuert
-#if 0
- case KEY_ESCAPE:
- if( pView->IsTracking() )
- {
- HideSelectionRect();
- //SelectAll( FALSE );
- SetNoSelection();
- ClearSelectedRectList();
- nFlags &= ~F_TRACKING;
- }
- else
- bKeyUsed = FALSE;
- break;
-#endif
-
-
case KEY_F2:
if( !bMod1 && !bShift )
EditTimeoutHdl( 0 );
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 65f61aa..a7a7bb6 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2188,15 +2188,6 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
if( ButtonDownCheckCtrl(rMEvt, pEntry, nY) == TRUE)
return;
// Inplace-Editing?
-#if 0
- if( rMEvt.IsMod2() && pView->IsInplaceEditingEnabled() )
- {
- SvLBoxItem* pItem = pView->GetItem( pEntry, aPos.X() );
- if( pItem )
- pView->EditingRequest( pEntry, pItem, aPos );
- return;
- }
-#endif
}
if ( aSelEng.GetSelectionMode() != NO_SELECTION )
aSelEng.SelMouseButtonDown( rMEvt );
diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 8d5f33a..674113e 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.cxx
@@ -893,30 +893,6 @@ static ImplFSNameItem aImplSimplifiedChinese[] =
{ 420, "\xe5\x88\x9d\xe5\x8f\xb7" }
};
-// -----------------------------------------------------------------------
-
-#if 0 // #i89077# disabled by popular request
-static ImplFSNameItem aImplTraditionalChinese[] =
-{
- { 50, "\xe5\x85\xab\xe8\x99\x9f" },
- { 55, "\xe4\xb8\x83\xe8\x99\x9f" },
- { 65, "\xe5\xb0\x8f\xe5\x85\xad" },
- { 75, "\xe5\x85\xad\xe8\x99\x9f" },
- { 90, "\xe5\xb0\x8f\xe4\xba\x94" },
- { 105, "\xe4\xba\x94\xe8\x99\x9f" },
- { 120, "\xe5\xb0\x8f\xe5\x9b\x9b" },
- { 140, "\xe5\x9b\x9b\xe8\x99\x9f" },
- { 150, "\xe5\xb0\x8f\xe4\xb8\x89" },
- { 160, "\xe4\xb8\x89\xe8\x99\x9f" },
- { 180, "\xe5\xb0\x8f\xe4\xba\x8c" },
- { 220, "\xe4\xba\x8c\xe8\x99\x9f" },
- { 240, "\xe5\xb0\x8f\xe4\xb8\x80" },
- { 260, "\xe4\xb8\x80\xe8\x99\x9f" },
- { 360, "\xe5\xb0\x8f\xe5\x88\x9d" },
- { 420, "\xe5\x88\x9d\xe8\x99\x9f" }
-};
-#endif
-
//------------------------------------------------------------------------
FontSizeNames::FontSizeNames( LanguageType eLanguage )
@@ -943,7 +919,7 @@ FontSizeNames::FontSizeNames( LanguageType eLanguage )
mnElem = SAL_N_ELEMENTS(aImplTraditionalChinese);
break;
#endif
-
+
default:
mpArray = NULL;
mnElem = 0;
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 2a489a6..594cc3e 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -1565,16 +1565,6 @@ void ValueSet::KeyInput( const KeyEvent& rKEvt )
nCalcPos + ( nLineCount * mnCols ));
else
{
-#if 0
- if( (KEY_DOWN == rKEvt.GetKeyCode().GetCode() ) && (GetStyle() & WB_MENUSTYLEVALUESET) )
- {
- Window* pParent = GetParent();
- pParent->GrabFocus();
- pParent->KeyInput( rKEvt );
- break;
- }
- else
-#endif
{
if ( mpNoneItem )
{
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index cf68050..5a35afd 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -192,15 +192,6 @@ void SAL_CALL EmbedEventListener_Impl::notifyEvent( const document::EventObject&
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
-#if 0
- if ( pObject && aEvent.EventName.equalsAscii("OnSaveDone") || aEvent.EventName.equalsAscii("OnSaveAsDone") )
- {
- // TODO/LATER: container must be set before!
- // When is this event created? Who sets the new container when it changed?
- pObject->UpdateReplacement();
- }
- else
-#endif
if ( pObject && aEvent.EventName.equalsAscii("OnVisAreaChanged") && pObject->GetViewAspect() != embed::Aspects::MSOLE_ICON && !pObject->IsChart() )
{
pObject->UpdateReplacement();
diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index 665ed47..f441582 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.cxx
@@ -30,11 +30,6 @@
#include "precompiled_svtools.hxx"
#include "registrationdlg.hxx"
-#if 0 /* @@@ */
-#include <svtools/svtdata.hxx>
-#include <svtools/svtools.hrc>
-#endif /* @@@ */
-
#include "registrationdlg.hrc"
#include <vcl/msgbox.hxx>
#include <tools/debug.hxx>
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index d16a66e..91c8741 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.cxx
@@ -343,12 +343,6 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
case '\'':
{
-#if 0
- // #i35653 patch from cmc
- ByteString aByteString(static_cast<char>(GetHexValue()));
- if (aByteString.Len())
- aStrBuffer.Append(String(aByteString, GetSrcEncoding()));
-#else
ByteString aByteString;
while (1)
{
@@ -399,7 +393,6 @@ void SvRTFParser::ScanText( const sal_Unicode cBreak )
if (aByteString.Len())
aStrBuffer.Append(String(aByteString, GetSrcEncoding()));
-#endif
}
break;
case '\\':
diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index 4d9f63a..38db96f 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.cxx
@@ -110,19 +110,6 @@ void SAL_CALL VCLXTabControl::dispose( ) throw(uno::RuntimeException)
VCLXWindow::dispose();
}
-#if 0
-void SAL_CALL VCLXTabControl::addTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
-{
- if ( listener.is() )
- maTabListeners.addInterface( listener );
-}
-
-void SAL_CALL VCLXTabControl::removeTabListener( const Reference< XTabListener >& listener ) throw (uno::RuntimeException)
-{
- if ( listener.is() )
- maTabListeners.removeInterface( listener );
-}
-#endif
TabControl *VCLXTabControl::getTabControl() const throw (uno::RuntimeException)
{
@@ -318,9 +305,6 @@ void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
// LATER: Nah, the proper fix is to get the XWindow hierarchy
// straight.
-#if 0
- setPosSize( area.X, area.Y, area.Width, area.Height, awt::PosSize::POSSIZE );
-#else
awt::Size currentSize = getSize();
awt::Size requestedSize (area.Width, area.Height);
// requestedSize.Height = getHeightForWidth( area.Width );
@@ -377,7 +361,6 @@ void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
if ( requestedSize.Height > currentSize.Height + 10)
setPosSize( 0, 0, 0, requestedSize.Height, awt::PosSize::HEIGHT );
}
-#endif
if (pageBasedSize.Width > parentSize.Width ()
|| pageBasedSize.Height > parentSize.Height ())
@@ -401,12 +384,7 @@ void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
// HACK: since our layout:: container don't implement XWindow, we have no easy
// way to set them invisible; lets just set all their children as such :P
-#if 0
- if ( xWin.is() )
- xWin->setVisible( active );
-#else
setChildrenVisible( xChild, active );
-#endif
if ( active )
{
diff --git a/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
index 231eced..dd2b4f1 100644
--- a/toolkit/source/awt/vclxtabpage.cxx
+++ b/toolkit/source/awt/vclxtabpage.cxx
@@ -109,20 +109,6 @@ void SAL_CALL VCLXTabPage::allocateArea( awt::Rectangle const& area )
OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, windowSize.Width(), windowSize.Height() );
#endif
-#if 0
- if (requestedSize.Width > parentSize.Width ()
- || requestedSize.Height > parentSize.Height ())
- {
-#ifndef __SUNPRO_CC
- OSL_TRACE ("%s: ***setting parent: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
-#endif
- parent->SetSizePixel ( Size (requestedSize.Width, requestedSize.Height) );
-
- if (Window *grand_parent = parent->GetParent ())
- grand_parent->SetSizePixel ( Size (requestedSize.Width, requestedSize.Height) );
- }
-#endif
-
if ( !bRealized )
{
setPosSize( area.X, area.Y, requestedSize.Width, requestedSize.Height, awt::PosSize::SIZE );
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 2715e30..8e7206a 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.cxx
@@ -157,16 +157,6 @@ void VCLXTopWindow_Base::toFront( ) throw(::com::sun::star::uno::RuntimeExcepti
void VCLXTopWindow_Base::toBack( ) throw(::com::sun::star::uno::RuntimeException)
{
-#if 0 // Not possible in VCL...
-
- ::vos::OGuard aGuard( GetMutexImpl() );
-
- Window* pWindow = GetWindowImpl();
- if ( pWindow )
- {
- ((WorkWindow*)pWindow)->ToBack();
- }
-#endif
}
void VCLXTopWindow_Base::setMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar >& rxMenu ) throw(::com::sun::star::uno::RuntimeException)
diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx
index 9fc5ede..80f8dfc 100644
--- a/toolkit/source/layout/core/container.cxx
+++ b/toolkit/source/layout/core/container.cxx
@@ -104,10 +104,6 @@ Container::setChildParent( const uno::Reference< awt::XLayoutConstrains >& xChil
if ( xContChild.is() )
{
xContChild->setParent( uno::Reference< awt::XLayoutContainer >( this ) );
-#if 0
- assert( !mxLayoutUnit.is() );
- xContChild->setLayoutUnit( mxLayoutUnit );
-#endif
}
}
@@ -118,46 +114,9 @@ Container::unsetChildParent( const uno::Reference< awt::XLayoutConstrains >& xCh
if ( xContChild.is() )
{
xContChild->setParent( uno::Reference< awt::XLayoutContainer >() );
-#if 0
- xContChild->setLayoutUnit( uno::Reference< awt::XLayoutUnit >() );
-#endif
}
}
-#if 0
-std::string
-Container::getLabel() // debug label
-{
- std::string depth;
- uno::Reference< awt::XLayoutContainer > xContainer( this );
- while ( xContainer.is() )
- {
- int node = 0; // child nb
- uno::Reference< awt::XLayoutContainer > xParent = xContainer->getContainerParent();
- if ( xParent.is() )
- {
-
- uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
- aChildren = xParent->getChildren();
- for ( node = 0; node < aChildren.getLength(); node++ )
- if ( aChildren[ node ] == xContainer )
- break;
- }
-
- char str[ 8 ];
- snprintf( str, 8, "%d", node );
- if ( depth.empty() )
- depth = std::string( str );
- else
- depth = std::string( str ) + ":" + depth;
-
- xContainer = xParent;
- }
-
- return std::string( getName() ) + " (" + depth + ")";
-}
-#endif
-
void Container::propertiesChanged()
{
// cl: why this assertion? This is also called to set properties at the top level widget which has no parent!?
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index f5e5b11..80013b2 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.cxx
@@ -70,26 +70,6 @@ getParent( uno::Reference< uno::XInterface > xRef )
return uno::Reference< awt::XWindowPeer >();
}
-#if 0
-static uno::Reference< awt::XWindowPeer >
-getToplevel( uno::Reference< uno::XInterface > xRef )
-{
- uno::Reference< awt::XWindowPeer > xTop, i;
- while ( ( i = uno::Reference< awt::XWindowPeer >( xRef, uno::UNO_QUERY ) ).is() )
- {
- xTop = i;
-
- uno::Reference< awt::XLayoutContainer > xCont( xRef, uno::UNO_QUERY );
- if ( xCont.is() )
- xRef = xCont->getParent();
- else
- xRef = uno::Reference< awt::XWindowPeer >();
- }
-
- return xTop;
-}
-#endif
-
}
#include "bin.hxx"
@@ -142,13 +122,7 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
{
desc.Type = awt::WindowClass_SIMPLE;
-#if 0
- // top container -- a wrapper for framewindow -- is de-coupled
- // from awt::XWindowPeer. So, getParent() fails at it.
- uno::Reference< awt::XWindowPeer > xWinParent = getParent( xParent );
-#else
uno::Reference< awt::XWindowPeer > xWinParent( xParent, uno::UNO_QUERY );
-#endif
assert( xParent.is() );
assert( xWinParent.is() );
/*
@@ -197,18 +171,6 @@ uno::Reference <awt::XLayoutConstrains> WidgetFactory::toolkitCreateWidget (uno:
return uno::Reference< awt::XLayoutConstrains >();
}
-#if 0 // This shadows the show="false" property and seems otherwise
- // unnecessary
-
- // default to visible, let then people change it on properties
- if ( ! bToplevel )
- {
- uno::Reference< awt::XWindow> xWindow( xPeer, uno::UNO_QUERY );
- if ( xWindow.is() )
- xWindow->setVisible( true );
- }
-#endif
-
return xPeer;
}
@@ -325,25 +287,6 @@ PropHelper::getFastPropertyValue( uno::Any& rValue,
{
OSL_ASSERT( nHandle >= 0 && nHandle < (sal_Int32) maDetails.size() );
const PropDetails &rInfo = maDetails[ nHandle ];
-#if 0
- switch ( rInfo.aType.getTypeClass() )
- {
-#define MAP(classtype,ctype) \
- case uno::TypeClass_##classtype: \
- rValue <<= *(ctype *)(rInfo.pValue); \
- break
- MAP( DOUBLE, double );
- MAP( SHORT, sal_Int16 );
- MAP( LONG, sal_Int32 );
- MAP( UNSIGNED_SHORT, sal_uInt16 );
- MAP( UNSIGNED_LONG, sal_uInt32 );
- MAP( STRING, ::rtl::OUString );
- default:
- DBG_ERROR( "ERROR: unknown type to map!" );
- break;
- }
-#undef MAP
-#endif
rValue.setValue( rInfo.pValue, rInfo.aType );
}
@@ -598,14 +541,9 @@ Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *paren
}
else if ( name.equalsAscii( "tabpage" ) )
{
-#if 0
- if ( !parent )
- parent = layout::TabPage::global_parent;
-#else
if (layout::TabPage::global_parent)
parent = layout::TabPage::global_parent;
layout::TabPage::global_parent = 0;
-#endif
//window = new TabPage( parent, ImplGetWinBits( attributes, 0 ) );
attributes ^= awt::WindowAttribute::SHOW;
WinBits nStyle = ImplGetWinBits( attributes, 0 );
@@ -629,13 +567,6 @@ Window* WidgetFactory::layoutCreateWindow (VCLXWindow** component, Window *paren
window = new Window( parent, ImplGetWinBits( attributes, 0 ) );
*component = new layoutimpl::LocalizedString();
}
-#if 0 // parent paranoia
- else if ( name.equalsAscii( "listbox" ) )
- {
- window = new ListBox (parent, ImplGetWinBits (attributes, 0));
- *component = new VCLXListBox ();
- }
-#endif
else if (name.equalsAscii ("svxfontlistbox")
|| name.equalsAscii ("svxlanguagebox"))
{
diff --git a/toolkit/source/layout/core/import.hxx b/toolkit/source/layout/core/import.hxx
index 45d7edc..8c9a6c5 100644
--- a/toolkit/source/layout/core/import.hxx
+++ b/toolkit/source/layout/core/import.hxx
@@ -89,54 +89,6 @@ private:
RadioGroupsMap mxRadioGroups;
};
-#if 0
-// generator
-class Widget
-{
-public:
- Widget( css::uno::Reference< css::awt::XToolkit > xToolkit,
- css::uno::Reference< css::awt::XWindow > xToplevel,
- rtl::OUString unoName, long attrbs );
- virtual ~Widget();
-
- virtual void setProperties( const PropList &rProps );
-
- virtual bool addChild( Widget *pChild );
- virtual void setChildProperties( Widget *pChild, const PropList &rProps );
-
- inline css::uno::Reference< css::awt::XLayoutConstrains > getPeer()
- { return mxWidget; }
-
- inline css::uno::Reference< css::awt::XLayoutConstrains > getContainer()
- { return mxContainer; }
-
-protected:
- css::uno::Reference< css::awt::XLayoutConstrains > mxWidget;
- css::uno::Reference< css::awt::XLayoutContainer > mxContainer;
-};
-
-class Root
-{
-public:
- Root( css::uno::Reference< css::awt::XToolkit > xToolkit )
- : mxToolkit( xToolkit ) {}
- ~Root();
-
- virtual Widget *create( rtl::OUString id, const rtl::OUString unoName, long attrbs );
-
- css::uno::Reference< css::awt::XLayoutConstrains > getById( rtl::OUString id );
- inline css::uno::Reference< css::awt::XLayoutConstrains > getToplevel();
-
-protected:
- css::uno::Reference< css::awt::XToolkit > mxToolkit;
- Widget *mpToplevel;
-
- typedef std::hash_map< rtl::OUString, css::uno::Reference< css::awt::XLayoutConstrains >,
- rtl::OUStringHash > ItemHash;
- ItemHash maItems;
-};
-#endif
-
// parser
class ImportContext : public ::cppu::WeakImplHelper1< css::xml::input::XRoot >
{
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 5974a18..0b15cff 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.cxx
@@ -349,31 +349,6 @@ static const AttributesMap attribsMap[] =
};
static const int attribsMapLen = sizeof( attribsMap ) / sizeof( AttributesMap );
-#if 0
-long getAttribute( const OUString &rName, bool bTopWindow )
-{
-
- int min = 0, max = attribsMapLen - 1, mid, cmp;
- do
- {
- mid = min +( max - min )/2;
- cmp = rName.compareToAscii( attribsMap[ mid ].name );
- if ( cmp > 0 )
- min = mid+1;
- else if ( cmp < 0 )
- max = mid-1;
- else
- {
- if ( bTopWindow || attribsMap[ mid ].value )
- return attribsMap[ mid ].windowAttr;
- return 0;
- }
- }
- while ( min <= max );
- return 0;
-}
-#endif
-
void propsFromAttributes( const uno::Reference<xml::input::XAttributes> & xAttributes,
PropList &rProps, sal_Int32 nNamespace )
{
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index 37b7e7a..db6bedc 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.cxx
@@ -330,24 +330,6 @@ LayoutWidget *LayoutRoot::create( OUString id, const OUString unoName, long attr
return pWidget;
}
-#if 0
-uno::Reference< awt::XLayoutConstrains > LayoutRoot::getToplevel()
-{
- if ( mpToplevel )
- return mpToplevel->getPeer();
- return uno::Reference< awt::XLayoutConstrains > ();
-}
-
-uno::Reference< awt::XLayoutConstrains > LayoutRoot::getById( OUString id )
-{
- uno::Reference< awt::XLayoutConstrains > rRef = 0;
- ItemHash::iterator it = maItems.find( id );
- if ( it != maItems.end() )
- rRef = it->second;
- return rRef;
-}
-#endif
-
LayoutWidget::LayoutWidget( uno::Reference< awt::XToolkit > xToolkit,
uno::Reference< awt::XLayoutContainer > xParent,
OUString unoName, long attrbs )
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index 61e83f8..75dd9a8 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.cxx
@@ -1126,25 +1126,6 @@ void TabControl::InsertPage (sal_uInt16 id, OUString const& title, sal_uInt16 po
#else
GetTabPage (id)->SetText (title);
#endif
-
-#if 0
- /// This so seems the right solution, but it makes the buttons of the
- /// tabdialog move up
-
- ::TabPage *page = GetTabPage (id);
- if (Window *w = dynamic_cast <Window*> (page))
- {
- w->SetParent (this);
- //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->AddChild (w);
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //uno::Reference <uno::XInterface> x (page->GetWindowPeer());
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->::Window::GetWindowPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
- }
- getImpl ().redraw ();
-#endif
}
void TabControl::RemovePage (sal_uInt16 id)
{
@@ -1175,21 +1156,6 @@ sal_uInt16 TabControl::GetCurPageId () const
void TabControl::SetTabPage (sal_uInt16 id, ::TabPage* page)
{
GetTabControl ()->SetTabPage (id, page);
-
-#if 0
- /// This so seems the right solution, but it makes the buttons of the
- /// tabdialog move up
- if (Window *w = dynamic_cast <Window*> (page))
- {
- w->SetParent (this);
- //GetVCLXTabControl ()->Box_Base::addChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->Box_Base::AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->AddChild (w);
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (w->GetPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetWindowPeer (), uno::UNO_QUERY));
- //GetVCLXTabControl ()->AddChild (uno::Reference <awt::XLayoutConstrains> (page->GetComponentInterface (), uno::UNO_QUERY));
- }
-#endif
getImpl ().redraw ();
}
::TabPage* TabControl::GetTabPage (sal_uInt16 id) const
@@ -1223,17 +1189,6 @@ void TabControl::SetTabPageSizePixel (Size const& size)
}
Size TabControl::GetTabPageSizePixel () const
{
-#if 0
- //return GetTabControl ()->GetTabPageSizePixel ();
- static size_t const tab_page_first_index = 1;
- for (size_t i = 0; i < GetPageCount (); i++)
- {
- ::TabPage *p = GetTabPage (i + tab_page_first_index);
- //if (dynamic_cast<Windowt*> (p))
- if (i) // URG
- return p->GetOptimalSize (WINDOWSIZE_MINIMUM);
- }
-#endif
return GetTabControl ()->GetTabPageSizePixel ();
}
@@ -1391,10 +1346,6 @@ public:
{
DBG_ERROR( "ERROR: failed to load image: `%s'" /*, pName*/ );
}
-#if 0
- else
- getImpl().mxGraphic->...();
-#endif
}
};
@@ -1410,20 +1361,6 @@ void FixedImage::setImage( ::Image const& i )
//getImpl().mxGraphic =
}
-#if 0
-
-FixedImage::FixedImage( const char *pName )
- : pImpl( new FixedImageImpl( pName ) )
-{
-}
-
-FixedImage::~FixedImage()
-{
- delete pImpl;
-}
-
-#endif
-
IMPL_CONSTRUCTORS( ProgressBar, Control, "ProgressBar" );
IMPL_GET_IMPL( ProgressBar );
diff --git a/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 3ceec4c..10a2cdf 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.cxx
@@ -161,19 +161,6 @@ public:
mxContainer = uno::Reference< awt::XLayoutContainer >( mxWidget, uno::UNO_QUERY );
mrLabel = rtl::OUString( label, strlen( label ), RTL_TEXTENCODING_UTF8 );
-
-#if 0 /* obsolete */
- // FIXME: this code is meant to import a XML file. Just use the importer,
- // then pass the root widget. But information like the ID string is lost.
- // So, this needs to be more closely tight to the importer.
- uno::Sequence< uno::Reference< awt::XLayoutConstrains > > aChildren;
- for ( int i = 0; i < aChildren.getLength(); i++ )
- {
- Widget *pChild = new Widget( aChildren[ i ], "---" );
- maChildren.push_back( pChild );
- pChild->mpParent = this;
- }
-#endif
}
Widget( rtl::OUString id, uno::Reference< awt::XToolkit > xToolkit,
@@ -205,17 +192,7 @@ public:
// set default Text property
// TODO: disable editing of text fields, check boxes selected, etc...
-#if 0
- uno::Reference< awt::XVclWindowPeer> xVclPeer( mxWidget, uno::UNO_QUERY )
- if ( xVclPeer.is() ) // XVclWindowPeer ignores missing / incorrect properties
-
-//FIXME: it looks odd on widgets like NumericField seeing text which is deleted
-// when you interact with it... We can avoid it for those widgets, by doing a getProp
-// of "Text" and check if it is empty or not.
-
- xVclPeer->setProperty( rtl::OUString::createFromAscii( "Text" ),
- uno::makeAny( rtl::OUString::createFromAscii( "new widget" ) ) );
-#endif
+
// store original properties
{
@@ -685,11 +662,6 @@ bool moveWidget( Widget *pWidget, bool up /*or down*/ )
}
else
{
-// TODO: this is a nice feature, but we probably want to do it explicitely...
-#if 0
- if ( pWidget->down() && pWidget->swapWithChild( pWidget->down() ) )
- return true;
-#endif
}
}
@@ -893,66 +865,14 @@ class PropertiesList : public layout::Table
mbMultiLine = bMultiLine;
}
-#if 0
- // TODO: make this global... We'll likely need it for export...
- struct Translate {
- const char *ori, *dest;
- };
- static rtl::OUString stringReplace( rtl::OUString _str,
- Translate *trans )
- {
- const sal_Unicode *str = _str.getStr();
- rtl::OUStringBuffer buf;
- int i, j, k;
- for ( i = 0; i < _str.getLength(); i++ )
- {
- for ( j = 0; trans[ j ].ori; j++ )
- {
- const char *ori = trans[ j ].ori;
- for ( k = 0; ori[ k ] && i+k < _str.getLength(); k++ )
- if ( ori[ k ] != str[ i+k ] )
- break;
- if ( !ori[ k ] )
- {
- // found substring
- buf.appendAscii( trans[ j ].dest );
- i += k;
- continue;
- }
- }
- buf.append( str[ i ] );
- }
- return buf.makeStringAndClear();
- }
-#endif
-
virtual void load()
{
-#if 0
- // replace end of lines by "\\n" strings
- Translate trans[] = {
- { "\\", "\\\\" }, { "\n", "\\n" }, { 0, 0 }
- };
- rtl::OUString str = anyToString( getValue() );
- str = stringReplace( str, trans );
- SetText( str );
-#endif
mpEdit->SetText( getValue() );
checkProperty();
}
virtual void store()
{
-#if 0
- // replace "\\n" strings by actual end of lines
- Translate trans[] = {
- { "\\\\", "\\" }, { "\\n", "\n" },
- { "\\", "" }, { 0, 0 }
- };
- rtl::OUString str = GetText();
- str = stringReplace( str, trans );
- save( uno::makeAny( str ) );
-#endif
save( uno::makeAny( (rtl::OUString) mpEdit->GetText() ) );
}
};
@@ -1210,20 +1130,6 @@ class PropertiesList : public layout::Table
"Printable", "Repeat", "RepeatDelay", "Tabstop"
};
-#if 0
- // checks list sanity -- enable this when you add some entries...
- for ( unsigned int i = 1; i < sizeof( toIgnoreList )/sizeof( char * ); i++ )
- {
- if ( strcmp(toIgnoreList[i-1], toIgnoreList[i]) >= 0 )
- {
- printf("ignore list not ordered properly: "
- "'%s' should come before '%s'\n",
- toIgnoreList[i], toIgnoreList[i-1]);
- exit(-1);
- }
- }
-#endif
-
int min = 0, max = sizeof( toIgnoreList )/sizeof( char * ) - 1, mid, cmp;
do {
mid = min + (max - min)/2;
diff --git a/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
index 1154c86..9ab3cce 100644
--- a/toolkit/workben/layout/zoom.cxx
+++ b/toolkit/workben/layout/zoom.cxx
@@ -92,16 +92,6 @@ struct SvxViewLayoutItem : public LAYOUT_SfxPoolItem
void SetBookMode( bool )
{
}
-#if 0 // needed for real SfxPoolItem
- int operator==( const SfxPoolItem& ) const
- {
- return 0;
- }
- SfxPoolItem* Clone( SfxItemPool* ) const
- {
- return 0;
- }
-#endif
};
#else /* !TEST_LAYOUT */
#include <svx/zoomitem.hxx>
diff --git a/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index 6ba414d..2f25221 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.hxx
@@ -269,8 +269,6 @@ private:
DirEntryFlag aDirFlag,
FSysPathStyle eStyle );
-//#if 0 // _SOLAR__PRIVATE
-
friend class Dir;
friend class FileStat;
friend const char* ImpCheckDirEntry( const void* p );
@@ -298,8 +296,6 @@ protected:
void ImpSetStat( FileStat *p ) { pStat = p; }
#endif
-//#endif
-
protected:
void SetError( ULONG nErr ) { nError = nErr; }
DirEntry* GetParent() { return pParent; }
diff --git a/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index c1d12c5..e7dc14b 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.hxx
@@ -121,8 +121,6 @@ private:
TOOLS_DLLPRIVATE inline void ImplMakeUnique();
-//#if 0 // _SOLAR__PRIVATE
-
public:
Point* ImplGetPointAry();
@@ -132,8 +130,6 @@ public:
void ImplRead( SvStream& rIStream );
void ImplWrite( SvStream& rOStream ) const;
-//#endif // __PRIVATE
-
public:
Polygon();
Polygon( USHORT nSize );
@@ -256,11 +252,9 @@ private:
ImplPolyPolygon* mpImplPolyPolygon;
-//#if 0 // _SOLAR__PRIVATE
TOOLS_DLLPRIVATE void ImplDoOperation( const PolyPolygon& rPolyPoly, PolyPolygon& rResult, ULONG nOperation ) const;
TOOLS_DLLPRIVATE void *ImplCreateArtVpath() const;
TOOLS_DLLPRIVATE void ImplSetFromArtVpath( void *pVpath );
-//#endif // __PRIVATE
public:
diff --git a/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index 554c168..1530474 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.hxx
@@ -158,11 +158,7 @@ public:\
SV_DECL_PERSIST_LIST(ClassName,EntryName)\
SV_IMPL_PERSIST_LIST(ClassName,EntryName)
-//#if 0 // _SOLAR__PRIVATE
DECLARE_UNIQUEINDEX( SvPersistUIdx,SvPersistBase *)
-//#else
-//typedef UniqueIndex SvPersistUIdx;
-//#endif
//=========================================================================
class SvStream;
diff --git a/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index 04fc90e..cf7dc26 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.hxx
@@ -367,11 +367,9 @@ public:
UINT32 GetRefCount() const { return nRefCount; }
};
-//#if 0 // _SOLAR__PRIVATE
#ifndef EMPTYARG
#define EMPTYARG
#endif
-//#endif
SV_DECL_IMPL_REF(SvRefBase)
diff --git a/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index 0377b79..63c4859 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.hxx
@@ -41,12 +41,10 @@ struct ImplResStringItem
XubString maStr;
long mnValue;
-//#if 0 // _SOLAR__PRIVATE
#ifdef _TOOLS_RESARY_CXX
ImplResStringItem( const XubString& rStr ) :
maStr( rStr ) {}
#endif
-//#endif
};
// ------------------
diff --git a/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
index d494e0f..75cb338 100644
--- a/tools/inc/tools/table.hxx
+++ b/tools/inc/tools/table.hxx
@@ -42,9 +42,7 @@ class TOOLS_DLLPUBLIC Table : private Container
{
private:
ULONG nCount;
-//#if 0 // _SOLAR__PRIVATE
TOOLS_DLLPRIVATE ULONG ImplGetIndex( ULONG nKey, ULONG* pIndex = NULL ) const;
-//#endif
public:
Table( USHORT nInitSize = 16, USHORT nReSize = 16 );
Table( const Table& rTable ) : Container( rTable )
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 42d400c..ba03e55 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -2499,22 +2499,6 @@ BOOL DirEntry::MakeShortName( const String& rLongName, DirEntryKind eKind,
// Auf Novell-Servern (wegen der rottigen Clients) nur 7bit ASCII
- // HRO: #69627# Weg mit dem Scheiss. Wenn es Client gibt, die so einen
- // BUG haben, dann muss halt der Client ersetzt werden, aber doch nicht das
- // Office kastrieren !!!
-
-#if 0
- if ( FSYS_STYLE_NWFS == GetPathStyle( ImpGetTopPtr()->GetName() ) )
- {
- for ( USHORT n = aLongName.Len(); n; --n )
- {
- short nChar = aLongName(n-1);
- if ( nChar < 32 || nChar >= 127 )
- aLongName.Erase( n-1, 1 );
- }
- }
-#endif
-
// bei FSYS_KIND_ALL den alten Namen merken und abh"angen (rename)
ByteString aOldName;
if ( FSYS_KIND_ALL == eKind )
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index 179631e..9ed3a9b 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.cxx
@@ -244,66 +244,6 @@ BOOL DirEntry::SetCWD( BOOL bSloppy ) const
|*
*************************************************************************/
-#if 0 // YD see dirent.cxx
-BOOL createLongNameEA( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
-
-FSysError DirEntry::MoveTo( const DirEntry& rDest ) const
-{
- DBG_CHKTHIS( DirEntry, ImpCheckDirEntry );
-
- DirEntry aTmpDest(rDest);
- FileStat aTmpStat(aTmpDest);
- if ( aTmpStat.IsKind(FSYS_KIND_DIR) )
- aTmpDest += DirEntry( GetName() );
-
- String aSource( GetFull() );
- String aDest( aTmpDest.GetFull() );
- String aShortSource("");
- String aShortDest("");
-
- if (Folder::IsAvailable())
- {
- if (IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(aSource);
- aShortSource = aItemIDPath.GetHostNotationPath();
- }
- if (rDest.IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(aDest);
- aShortDest = aItemIDPath.GetHostNotationPath();
- }
- }
-
- APIRET nRet = DosMove( aShortSource.Len()>0?(PSZ)aShortSource.GetStr():(PSZ)aSource.GetStr(),
- aShortDest.Len()>0?(PSZ)aShortDest.GetStr():(PSZ)aDest.GetStr());
-
- if ( nRet == ERROR_DIRECTORY_IN_CDS ||
- nRet == ERROR_CURRENT_DIRECTORY )
- {
- // 2nd chance with modified CWD
- DosSetCurrentDir( (PSZ) "\\" );
- nRet = DosMove( aShortSource.Len()>0?(PSZ)aShortSource.GetStr():(PSZ)aSource.GetStr(),
- aShortDest.Len()>0?(PSZ)aShortDest.GetStr():(PSZ)aDest.GetStr());
- }
- else if ( nRet == ERROR_NOT_SAME_DEVICE )
- {
- // other volume => copy+delete
- FileCopier aMover( *this, rDest );
- nRet = aMover.Execute( FSYS_ACTION_MOVE|FSYS_ACTION_RECURSIVE );
- return nRet;
- }
-
- if ( (nRet==NO_ERROR) && aShortDest.Len()>0)
- {
- createLongNameEA((const char*)aShortDest, FILE_NORMAL, rDest.GetName());
- }
-
- return ApiRet2ToSolarError_Impl( nRet );
-}
-#endif // 0
//-------------------------------------------------------------------------
@@ -535,15 +475,6 @@ BOOL FileStat::Update( const DirEntry& rDirEntry, BOOL bAccessRemovableDevice )
aTempDirEntry.ToAbs();
ByteString aFullName( aTempDirEntry.GetFull(), osl_getThreadTextEncoding() );
-#if 0 // YD
- if (Folder::IsAvailable() && aTempDirEntry.IsLongNameOnFAT())
- {
- // in String mit kurzem Pfad wandeln
- ItemIDPath aItemIDPath(aTempDirEntry.GetFull());
- aFullName = ByteString( aItemIDPath.GetHostNotationPath(), osl_getThreadTextEncoding() );
- }
-#endif
-
p = (char *) aFullName.GetBuffer();
FILESTATUS3 filestat;
@@ -618,18 +549,6 @@ BOOL IsRedirectable_Impl( const ByteString &rPath )
return FALSE;
}
-#if 0
-BOOL IsRedirectable_Impl( const String &rPath )
-{
- if ( rPath.Len() >= 3 && ':' == rPath.GetStr()[1] )
- {
- DriveMapItem &rItem = aDriveMap[toupper(rPath[0]) - 'A'];
- return FSYS_KIND_FIXED != rItem.nKind;
- }
- return FALSE;
-}
-#endif
-
/*************************************************************************
|*
@@ -705,54 +624,6 @@ const char* TempDirImpl( char *pBuf )
#define NLS_CODEPAGE 850
/*====================================================================
- * CreateCaseMapImpl()
- * creates a map of each character to convert to lower
- *--------------------------------------------------------------------*/
-
-#if 0
-void CreateCaseMapImpl()
-{
- // build a string starting with code 0 as first character upto 255
- char sTemp[256];
- USHORT n;
-
- for ( n = 0; n < 256; ++n )
- sTemp[n] = (char) n;
-
- // convert string to upper case
- COUNTRYCODE aCountry;
- aCountry.country = CURRENT_COUNTRY; /* Country code */
- aCountry.codepage = NLS_CODEPAGE; /* Code page */
- DosMapCase( 255, &aCountry, sTemp+1 );
-
- // fill a global buffer starting with code 0 as first character upto 255
- for ( n = 0; n < 256; ++n )
- sCaseMap[n] = (char) n;
-
- // reorder by upper-code and store in a global buffer
- for ( n = 255; n > 0; --n )
- // was this character converted?
- if ( sTemp[n] != (char) n )
- // we found a convertion from upper to lower
- sCaseMap[ (unsigned char) sTemp[n] ] = (char) n;
-
- bCaseMap = TRUE;
-}
-
-String ToLowerImpl( const String& rSource )
-{
- if ( !bCaseMap )
- CreateCaseMapImpl();
-
- // TH sagt: International ist zu langsam, also mit einer eigenen Map
- ByteString aLower( rSource );
- for ( USHORT n = 0; n < aLower.Len(); ++n )
- aLower[n] = sCaseMap[ (unsigned char) aLower[n] ];
- return aLower;
-}
-#endif // 0
-
-/*====================================================================
* CreateDriveMapImpl()
* creates a map of drive-infos like FileSystem (style) and Kind (remote)
*--------------------------------------------------------------------*/
diff --git a/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 0fadabd..241957a 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.cxx
@@ -688,13 +688,6 @@ ULONG INetRFC822Message::SetHeaderField (
nIdx = INETMSG_RFC822_X_MAILER;
break;
-#if 0 /* NYI */
- case 'p':
- check = "riority";
- eOkState = INETMSG_RFC822_X_PRIORITY;
- break;
-#endif /* NYI */
-
default:
eState = INETMSG_RFC822_JUNK;
break;
diff --git a/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index c851fa2..b760364 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.cxx
@@ -484,48 +484,10 @@ sal_Bool SvFileStream::UnlockFile()
|*
*************************************************************************/
-#if 0
-BOOL createLongNameEA ( const PCSZ pszPath, ULONG ulAttributes, const String& aLongName );
-#endif
-
void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
{
String aParsedFilename;
-#if 0
- if ( Folder::IsAvailable() && (rFilename.Search('{') < 9) )
- {
- String aVirtualPart;
- String aRealPart;
- String aVirtualPath;
- ItemIDPath aVirtualURL;
- ULONG nDivider = 0;
-
- String aVirtualString(rFilename);
-
- for (int x=aVirtualString.Len(); x>0; x--)
- {
- if (aVirtualString.Copy(x,1).Compare("}")==COMPARE_EQUAL)
- {
- nDivider = x;
- break;
- }
- }
-
- aVirtualPart = aVirtualString.Copy(0,nDivider+1);
- aRealPart = aVirtualString.Copy(nDivider+2);
-
- aVirtualURL = aVirtualPart;
- aVirtualPath = aVirtualURL.GetHostNotationPath();
-
- DirEntry aTempDirEntry(aVirtualPath);
-
- aTempDirEntry += aRealPart;
-
- aParsedFilename = aTempDirEntry.GetFull();
- }
- else
-#endif // 0
{
aParsedFilename = rFilename;
}
@@ -587,24 +549,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
nOpenAction |= OPEN_ACTION_OPEN_IF_EXISTS;
}
-#if 0 // YD
- //
- // resolves long FAT names used by OS2
- //
- BOOL bIsLongOS2=FALSE;
- if (Folder::IsAvailable())
- {
- DirEntry aDirEntry(rFilename);
- if (aDirEntry.IsLongNameOnFAT())
- {
- // in kurzen Pfad wandeln
- ItemIDPath aItemIDPath(rFilename);
- aParsedFilename = aItemIDPath.GetHostNotationPath();
- bIsLongOS2 = TRUE;
- }
- }
-#endif
-
aFilename = aParsedFilename;
ByteString aFileNameA( aFilename, gsl_getSystemTextEncoding());
FSysRedirector::DoRedirect( aFilename );
@@ -650,22 +594,6 @@ void SvFileStream::Open( const String& rFilename, StreamMode nOpenMode )
if( nReadWriteBits != OPEN_ACCESS_READONLY )
bIsWritable = TRUE;
}
-
-#if 0
- if (bIsOpen && bIsLongOS2)
- {
- //file schließen, da sonst createLongName u.U. nicht möglich
- Close();
-
- // erzeugtem File langen Namen geben
- DirEntry aDirEntry(rFilename);
- createLongNameEA(aFileNameA.GetBuffer(), FILE_NORMAL, aDirEntry.GetName());
-
- // und wieder oeffnen
- ReOpen();
- }
-#endif
-
}
/*************************************************************************
@@ -756,110 +684,4 @@ void SvFileStream::SetSize( ULONG nSize )
}
}
-#if 0
-/*************************************************************************
-|*
-|* SvSharedMemoryStream::AllocateMemory()
-|*
-|* Beschreibung STREAM.SDW
-|* Ersterstellung CL 05.05.95
-|* Letzte Aenderung CL 05.05.95
-|*
-*************************************************************************/
-
-sal_Bool SvSharedMemoryStream::AllocateMemory( ULONG nNewSize )
-{
- DBG_ASSERT(aHandle==0,"Keine Handles unter OS/2");
- DBG_ASSERT(nNewSize,"Cannot allocate zero Bytes");
- APIRET nRet = DosAllocSharedMem( (void**)&pBuf, (PSZ)NULL, nNewSize,
- PAG_READ | PAG_WRITE | PAG_COMMIT |
- OBJ_GIVEABLE | OBJ_GETTABLE | OBJ_ANY);
- return( nRet == 0 );
-}
-
-/*************************************************************************
-|*
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list