Next portion of those easy hacks, code there will be a lot easier to read now :) -- Best regards, Marcin "eXine" M.
From 60a330c349b333b3ad5a263e4043efdf82ba54e3 Mon Sep 17 00:00:00 2001
From: eXine <exine@jun.pl>
Date: Tue, 2 Nov 2010 18:14:23 +0100
Subject: [PATCH] cui: more fixes of dead code, bogus and German
---
cui/source/factory/dlgfact.cxx | 1 -
cui/source/factory/dlgfact.hxx | 33 +++--------------
cui/source/inc/SpellDialog.hxx | 4 +-
cui/source/inc/acccfg.hxx | 44 ----------------------
cui/source/inc/autocdlg.hxx | 3 +-
cui/source/inc/backgrnd.hxx | 20 +++++-----
cui/source/inc/bbdlg.hxx | 2 +-
cui/source/inc/border.hxx | 6 ++--
cui/source/inc/cfg.hxx | 4 +-
cui/source/inc/cfgutil.hxx | 1 -
cui/source/inc/chardlg.hxx | 3 --
cui/source/inc/connect.hxx | 5 +--
cui/source/inc/cuicharmap.hxx | 3 --
cui/source/inc/cuifmsearch.hxx | 20 +++++-----
cui/source/inc/cuigrfflt.hxx | 23 ------------
cui/source/inc/cuihyperdlg.hxx | 1 -
cui/source/inc/cuitabarea.hxx | 53 ++++++++++-----------------
cui/source/inc/cuitabline.hxx | 19 ++++------
cui/source/inc/dialmgr.hxx | 10 +++---
cui/source/inc/dstribut.hxx | 25 +------------
cui/source/inc/hldocntp.hxx | 5 +--
cui/source/inc/hldoctp.hxx | 12 +++---
cui/source/inc/hlmarkwn.hxx | 3 +-
cui/source/inc/hltpbase.hxx | 3 --
cui/source/inc/labdlg.hxx | 1 -
cui/source/inc/macropg.hxx | 4 --
cui/source/inc/measure.hxx | 2 +-
cui/source/inc/numfmt.hxx | 9 +----
cui/source/inc/numpages.hxx | 33 ++++++-----------
cui/source/inc/page.hxx | 11 +-----
cui/source/inc/paragrph.hxx | 17 ++-------
cui/source/inc/scriptdlg.hxx | 8 ----
cui/source/inc/tabstpge.hxx | 18 +---------
cui/source/inc/textanim.hxx | 1 -
cui/source/inc/transfrm.hxx | 5 ---
cui/source/inc/treeopt.hxx | 1 -
cui/source/options/connpooloptions.cxx | 1 -
cui/source/options/dbregister.src | 1 -
cui/source/options/doclinkdialog.cxx | 1 -
cui/source/options/fontsubs.cxx | 45 +----------------------
cui/source/options/fontsubs.hrc | 3 --
cui/source/options/fontsubs.hxx | 11 ------
cui/source/options/fontsubs.src | 4 --
cui/source/options/internationaloptions.cxx | 15 +-------
cui/source/options/internationaloptions.src | 21 -----------
cui/source/options/optaccessibility.cxx | 1 -
cui/source/options/optaccessibility.hrc | 2 -
cui/source/options/optaccessibility.src | 25 -------------
cui/source/options/optasian.cxx | 28 --------------
cui/source/options/optasian.src | 36 ------------------
50 files changed, 99 insertions(+), 508 deletions(-)
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index ededf91..002cd75 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -132,7 +132,6 @@ short AbstractSvxZoomDialog_Impl::Execute()
return pDlg->Execute();
}
-//IMPL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl);
IMPL_ABSTDLG_BASE(AbstractSearchProgress_Impl);
IMPL_ABSTDLG_BASE(AbstractTakeProgress_Impl);
IMPL_ABSTDLG_BASE(AbstractTitleDialog_Impl);
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 30e2da2..92a73ad 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -80,7 +80,6 @@ public:
\
{} \
virtual ~Class(); \
virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
#define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \
@@ -136,11 +135,11 @@ class AbstractTabDialog_Impl : public SfxAbstractTabDialog
DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog)
virtual void SetCurPageId( USHORT nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by
CHINA001
- virtual void SetInputSet( const SfxItemSet* pInSet ); //add by
CHINA001
+ virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
- virtual void SetText( const XubString& rStr ); //add by CHINA001
- virtual String GetText() const; //add by CHINA001
+ virtual void SetText( const XubString& rStr );
+ virtual String GetText() const;
};
//for SvxDistributeDialog begin
@@ -235,24 +234,7 @@ class AbstractSpellDialog_Impl : public AbstractSpellDialog
virtual Window* GetWindow();
virtual SfxBindings& GetBindings();
};
-
-//for SvxSpellCheckDialog begin
-//STRIP001 class AbstractSvxSpellCheckDialog_Impl : public AbstractSvxSpellCheckDialog //add for
FmShowColsDialog
-//STRIP001 {
-//STRIP001 SvxSpellCheckDialog * pDlg;
-//STRIP001 public
-//STRIP001 AbstractSvxSpellCheckDialog_Impl ( SvxSpellCheckDialog* p)
-//STRIP001 : pDlg(p)
-//STRIP001 {}
-//STRIP001 virtual USHORT Execute() ;
-//STRIP001 virtual void SetNewEditWord( const String& _rNew ) ;
-//STRIP001 virtual void SetLanguage( sal_uInt16 nLang ) ;
-//STRIP001 virtual void HideAutoCorrect() ;
-//STRIP001 virtual String GetNewEditWord();
-//STRIP001 virtual void SetNewEditWord( const String& _rNew );
-//STRIP001 }
-//for SvxSpellCheckDialog end
-
+//for SvxSpellDialog end
//for SearchProgress begin
class SearchProgress;
@@ -689,11 +671,6 @@ public:
SfxBindings* pBindings,
svx::SpellDialogChildWindow* pSpellChildWindow );
-//STRIP001 virtual AbstractSvxSpellCheckDialog * CreateSvxSpellCheckDialog( Window* pParent,
//add for SvxSpellCheckDialog
-//STRIP001 ::com::sun::star::uno::Reference<
-//STRIP001 ::com::sun::star::linguistic2::XSpellChecker1 > &xChecker,
-//STRIP001 SvxSpellWrapper* pWrapper,
-//STRIP001 sal_uInt32 nResId);
virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent,
GalleryTheme* pThm );
virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent,
const INetURLObject& rStartURL);
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index f10b52e..bea380d 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -70,7 +70,7 @@ namespace svx{
class SpellDialog;
struct SpellErrorDescription;
// ------------------------------------------------------------------
-class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/
+class SentenceEditWindow_Impl : public MultiLineEdit
{
using MultiLineEdit::SetText;
@@ -236,7 +236,7 @@ private:
/** Retrieves the next sentence.
*/
- bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the
curretn sentence*/);
+ bool GetNextSentence_Impl(bool bUseSavedSentence, bool bRechek /*for rechecking the
current sentence*/);
/** Corrects all errors that have been selected to be changed always
*/
bool ApplyChangeAllList_Impl(SpellPortions& rSentence, bool& bHasReplaced);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 55b35cd..3367d1f 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -222,50 +222,6 @@ public:
void ExpandEntry ( USHORT nPos, const String &rStr );
};
-/*
-// class USHORTArr **********************************************************
-
-DECL_2BYTEARRAY(USHORTArr, USHORT, 10, 10)
-
-// class SfxAcceleratorConfigDialog **************************************************
-
-class SfxAcceleratorConfigDialog : public ModalDialog
-{
- OKButton aOKButton;
- CancelButton aCancelButton;
- PushButton aChangeButton;
- PushButton aRemoveButton;
- SfxAcceleratorConfigListBox aEntriesBox;
- FixedText aDescriptionTextText;
- FixedText aDescriptionInfoText;
- FixedLine aKeyboardGroup;
- FixedText aGroupText;
- ListBox aGroupLBox;
- FixedText aFunctionText;
- ListBox aFunctionBox;
- FixedText aKeyText;
- ListBox aKeyBox;
- FixedLine aFunctionsGroup;
-
- USHORTArr aAccelArr;
- USHORTArr aFunctionArr;
- USHORTArr aKeyArr;
-
- void OKHdl ( Button * );
- void ChangeHdl( Button * );
- void RemoveHdl( Button * );
- void SelectHdl( ListBox *pListBox );
-
- KeyCode PosToKeyCode ( USHORT nPos ) const;
- USHORT KeyCodeToPos ( const KeyCode &rCode ) const;
- String GetFunctionName( KeyFuncType eType ) const;
-
-public:
-
- SfxAcceleratorConfigDialog( Window *pParent );
-};
-*/
-
class SvxShortcutAssignDlg : public SfxSingleTabDialog
{
public:
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index b93998a..bf439fb 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -305,7 +305,7 @@ private:
DECL_LINK(SelectHdl, ListBox*);
DECL_LINK(ModifyHdl, Edit*);
- void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
+ void RefillReplaceBoxes(BOOL bFromReset, //Box filled with new language
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
@@ -417,7 +417,6 @@ class OfaAutoCompleteTabPage : public SfxTabPage
CheckBox aCBCollect;//Collect words
CheckBox aCBRemoveList;//...save the list for later use...
- //--removed--CheckBox aCBEndless;//
FixedText aFTExpandKey;
ListBox aDCBExpandKey;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 9ec0548..d825193 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -69,11 +69,11 @@ public:
virtual void FillUserData();
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
- void ShowSelector(); // Umschalt-ListBox aktivieren
- void ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle)
- void ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer
(Absatz/Zeichen)
+ void ShowSelector(); // Shift-ListBox activation
+ void ShowTblControl(); // for the Writer (cells/rows/tables)
+ void ShowParaControl(BOOL bCharOnly = FALSE); // for the Writer
(paragraph/characters)
void EnableTransparency(BOOL bColor, BOOL bGraphic);
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
@@ -81,7 +81,7 @@ private:
SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
~SvxBackgroundTabPage();
- // Hintergrundfarbe ------------------------------------
+ // Background color ------------------------------------
Control aBorderWin;
ValueSet aBackgroundColorSet;
FixedLine aBackgroundColorBox;
@@ -89,7 +89,7 @@ private:
//color transparency
FixedText aColTransFT;
MetricField aColTransMF;
- // Hintergrund-Bitmap ----------------------------------
+ // Background Bitmap ----------------------------------
PushButton aBtnBrowse;
CheckBox aBtnLink;
CheckBox aBtnPreview;
@@ -105,13 +105,13 @@ private:
MetricField aGraphTransMF;
BackgroundPreviewImpl* pPreviewWin2;
- // Selektor --------------------------------------------
+ // Selector --------------------------------------------
FixedText aSelectTxt;
ListBox aLbSelect;
const String aStrBrowse;
const String aStrUnlinked;
- // DDListBox fuer Writer -------------------------------
+ // DDListBox for Writer -------------------------------
FixedText aTblDesc;
ListBox aTblLBox;
@@ -133,9 +133,9 @@ private:
SvxBackgroundPage_Impl* pPageImpl;
SvxOpenGraphicDialog* pImportDlg;
- // Items fuer Sw-Tabelle muessen gesammelt werden
+ // Items for Sw-Table must be corrected
SvxBackgroundTable_Impl* pTableBck_Impl;
- // auch fuer die Absatzvorlage
+ // also for the paragraph style
SvxBackgroundPara_Impl* pParaBck_Impl;
#ifdef _SVX_BACKGRND_CXX
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 08bb80b..ba55c89 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -49,7 +49,7 @@ protected:
virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
private:
- BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg
+ BOOL bEnableBackgroundSelector; // for Border/Background
};
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 48ef3ee..0cee72c 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -59,7 +59,7 @@ public:
virtual void Reset( const SfxItemSet& );
void HideShadowControls();
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -105,7 +105,7 @@ private:
//properties - "Merge with next paragraph" in Writer
FixedLine aPropertiesFL;
CheckBox aMergeWithNextCB;
- // --> collapsing table borders FME 2005-05-27 #i29550#
+ // --> collapsing table borders #i29550#
CheckBox aMergeAdjacentBordersCB;
// <--
@@ -145,7 +145,7 @@ private:
// Filler
void FillLineListBox_Impl();
- // Setzen von einzelnen Frame-/Core-Linien
+ // share for individual Frame-/Core-Line
void ResetFrameLine_Impl( svx::FrameBorderType eBorder,
const SvxBorderLine* pCurLine,
bool bValid );
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index ccc45bb..da943a7 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -437,7 +437,7 @@ protected:
::com::sun::star::uno::Reference
< ::com::sun::star::frame::XFrame > m_xFrame;
- SvxConfigPage( Window*, /* const ResId&, */ const SfxItemSet& );
+ SvxConfigPage( Window*, const SfxItemSet& );
virtual ~SvxConfigPage();
DECL_LINK( MoveHdl, Button * );
@@ -783,7 +783,7 @@ private:
void ImportGraphics(
const com::sun::star::uno::Sequence< rtl::OUString >& aURLs );
- BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);// Added by shizhoubo
+ BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize);
public:
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 7d14afe..61f5415 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -157,7 +157,6 @@ struct SvxConfigGroupBoxResource_Impl;
class SfxConfigGroupListBox_Impl : public SvTreeListBox
{
SvxConfigGroupBoxResource_Impl* pImp;
- //SfxSlotPool* pSlotPool;
SfxConfigFunctionListBox_Impl* pFunctionListBox;
SfxGroupInfoArr_Impl aArr;
ULONG nMode;
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 49169b0..6e1e77d 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -82,7 +82,6 @@ public:
using SfxTabPage::DeactivatePage;
virtual void ActivatePage( const SfxItemSet& rSet );
-// virtual int DeactivatePage( SfxItemSet* pSet = 0 );
};
@@ -254,10 +253,8 @@ private:
DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* );
public:
-// using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
-// virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
public:
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 7ffbcee..fbea84f 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -96,7 +96,7 @@ public:
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
};
/*************************************************************************
@@ -114,7 +114,6 @@ public:
~SvxConnectionDialog();
};
-
#endif // _SVX_CONNECT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 4a31138..7a17f8a 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -89,12 +89,10 @@ friend class SvxCharacterMap;
SvxShowCharSet aShowSet;
SvxShowText aShowText;
-// SvxShowText aShowShortcut;
OKButton aOKBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
PushButton aDeleteBtn;
-// PushButton aAssignBtn;
FixedText aFontText;
ListBox aFontLB;
FixedText aSubsetText;
@@ -102,7 +100,6 @@ friend class SvxCharacterMap;
FixedText aSymbolText;
SvxShowText aShowChar;
FixedText aCharCodeText;
-// FixedText aAssignText;
Font aFont;
BOOL bOne;
const SubsetMap* pSubsetMap;
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index d204247..c273b8a 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <svx/fmsearch.hxx> //CHINA001
+#include <svx/fmsearch.hxx>
#define _SVSTDARR_STRINGSDTOR
#include <svl/svstdarr.hxx>
@@ -55,7 +55,7 @@ namespace svxform {
}
//
===================================================================================================
-// = class FmSearchDialog - Dialog fuer Suchen in Formularen/Tabellen
+// = class FmSearchDialog - Dialog for searching in Forms/Tables
//
===================================================================================================
struct FmSearchProgress;
@@ -66,7 +66,7 @@ class FmSearchDialog : public ModalDialog
{
friend class FmSearchEngine;
- // meine ganzen Controls
+ // my all Controls
FixedLine m_flSearchFor;
RadioButton m_rbSearchForText;
RadioButton m_rbSearchForNull;
@@ -104,19 +104,19 @@ class FmSearchDialog : public ModalDialog
Window* m_pPreSearchFocus;
- Link m_lnkFoundHandler; // Handler fuer "gefunden"
- Link m_lnkCanceledNotFoundHdl; // Handler fuer Positionierung des Cursors
+ Link m_lnkFoundHandler; // Handler for "found"
+ Link m_lnkCanceledNotFoundHdl; // Handler for Positioning the Cursors
- Link m_lnkContextSupplier; // fuer Suche in verschiedenen Kontexten
+ Link m_lnkContextSupplier; // for search in contexts
- // ein Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
+ // an Array, in dem ich mir fuer jeden Kontext das aktuell selektierte Feld merke
::std::vector<String> m_arrContextFields;
// fuer die eigentliche Arbeit ...
FmSearchEngine* m_pSearchEngine;
Timer m_aDelayedPaint;
- // siehe EnableSearchUI
+ // see EnableSearchUI
::svxform::FmSearchConfigItem* m_pConfig;
public:
@@ -183,7 +183,7 @@ protected:
void SaveParams() const;
private:
- // Handler fuer die Controls
+ // Handler for the Controls
DECL_LINK( OnClickedFieldRadios, Button* );
DECL_LINK( OnClickedSearchAgain, Button* );
DECL_LINK( OnClickedSpecialSettings, Button* );
@@ -201,7 +201,7 @@ private:
DECL_LINK( OnSearchProgress, FmSearchProgress* );
DECL_LINK( OnDelayedPaint, void* );
- // siehe EnableSearchUI
+ // see EnableSearchUI
void implMoveControls(Control** _ppControls, sal_Int32 _nControls, sal_Int32 _nUp, Control*
_pToResize);
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index ed17fa9..a0d8e63 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -40,30 +40,7 @@
#include <svx/graphctl.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/rectenum.hxx>
-/*
-// ---------------
-// - Error codes -
-// ---------------
-#define SVX_GRAPHICFILTER_ERRCODE_NONE 0x00000000
-#define SVX_GRAPHICFILTER_UNSUPPORTED_GRAPHICTYPE 0x00000001
-#define SVX_GRAPHICFILTER_UNSUPPORTED_SLOT 0x00000002
-
-// --------------------
-// - SvxGraphicFilter -
-// --------------------
-
-class SfxRequest;
-class SfxItemSet;
-
-class SvxGraphicFilter
-{
-public:
-
- static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
- static void DisableGraphicFilterSlots( SfxItemSet& rSet );
-};
-*/
// -----------------------
// - GraphicFilterDialog -
// -----------------------
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 43d25a2..a34f13c 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -95,7 +95,6 @@ protected:
virtual BOOL Close();
virtual void Move();
-// virtual long PreNotify( NotifyEvent& rNEvt );
public:
SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
~SvxHpLinkDlg ();
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index fa61e02..d777100 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,7 +42,6 @@ class SvxAreaTabDialog : public SfxTabDialog
{
private:
SdrModel* mpDrawModel;
-// const SdrView* mpView;
XColorTable* mpColorTab;
XColorTable* mpNewColorTab;
@@ -120,10 +119,8 @@ class SvxTransparenceTabPage : public SvxTabPage
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- //CHINA001 UINT16* pPageType;
- //CHINA001 UINT16* pDlgType;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
+ UINT16 nPageType;
+ UINT16 nDlgType;
// main selection
FixedLine aFlProp;
@@ -188,11 +185,9 @@ public:
virtual int DeactivatePage(SfxItemSet* pSet);
virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
- //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
- //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
- void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001
- void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ void SetPageType(UINT16 nInType) { nPageType = nInType; }
+ void SetDlgType(UINT16 nInType) { nDlgType = nInType; }
+ virtual void PageCreated (SfxAllItemSet aSet);
};
/*************************************************************************
@@ -258,12 +253,9 @@ private:
ChangeType* pnGradientListState;
ChangeType* pnHatchingListState;
- //CHINA001 USHORT* pPageType;
- //CHINA001 USHORT* pDlgType;
- //CHINA001 USHORT* pPos;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType;//add CHINA001
- UINT16 nPos; //add CHINA001
+ UINT16 nPageType;
+ UINT16 nDlgType;
+ UINT16 nPos;
BOOL* pbAreaTP;
@@ -287,7 +279,6 @@ private:
DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * );
DECL_LINK( ClickBitmapHdl_Impl, void * );
DECL_LINK( ModifyBitmapHdl_Impl, void * );
-// DECL_LINK( ModifyTransparentHdl_Impl, void * );
DECL_LINK( ModifyStepCountHdl_Impl, void * );
DECL_LINK( ModifyTileHdl_Impl, void * );
DECL_LINK( ClickScaleHdl_Impl, void * );
@@ -306,7 +297,7 @@ public:
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
-
+
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
@@ -314,14 +305,11 @@ public:
{ pHatchingList = pHtchLst; }
void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
- //CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
- //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001
- //CHINA001 void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001
+ void SetPageType( UINT16 nInType ) { nPageType = nInType; }
+ void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
+ void SetPos( UINT16 nInPos ) { nPos = nInPos; }
void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
@@ -357,8 +345,8 @@ private:
XColorTable* pColorTab;
ChangeType* pnColorTableState;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
+ UINT16 nPageType;
+ UINT16 nDlgType;
USHORT* pPos;
BOOL* pbAreaTP;
@@ -388,13 +376,11 @@ public:
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001
+ void SetPageType( UINT16 nInType ) { nPageType = nInType; }
+ void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
void DisablePage( BOOL bIn ) { bDisable = bIn; }
};
@@ -798,7 +784,6 @@ public:
virtual void FillUserData();
};
-
#endif // _CUI_TAB_AREA_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 03e83ab..b915eee 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -154,7 +154,7 @@ private:
Graphic aSymbolGraphic;
Size aSymbolSize;
BOOL bSymbols;
-
+
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
BOOL bObjSelected;
@@ -174,8 +174,8 @@ private:
ChangeType* pnLineEndListState;
ChangeType* pnDashListState;
ChangeType* pnColorTableState;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
+ UINT16 nPageType;
+ UINT16 nDlgType;
USHORT* pPosDashLb;
USHORT* pPosLineEndLb;
@@ -183,14 +183,13 @@ private:
// #63083#
INT32 nActLineWidth;
-
+
//Handler für Gallery-Popup-Menue-Button + Size
DECL_LINK( GraphicHdl_Impl, MenuButton * );
DECL_LINK( MenuCreateHdl_Impl, MenuButton * );
DECL_STATIC_LINK( SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem* );
DECL_LINK( SizeHdl_Impl, MetricField * );
DECL_LINK( RatioHdl_Impl, CheckBox * );
- // <- Symbole
#ifdef _SVX_TPLINE_CXX
DECL_LINK( ClickInvisibleHdl_Impl, void * );
@@ -215,7 +214,6 @@ public:
void Construct();
-
static SfxTabPage* Create( Window*, const SfxItemSet& );
static USHORT* GetRanges();
@@ -234,8 +232,8 @@ public:
void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType(
USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void
SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
+ void SetPageType( UINT16 nInType ) { nPageType = nInType; }
+ void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }
void SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
void SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
@@ -243,7 +241,7 @@ public:
void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
@@ -426,7 +424,6 @@ public:
virtual void DataChanged( const DataChangedEvent& rDCEvt );
};
-
#endif // _CUI_TAB_LINE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/dialmgr.hxx b/cui/source/inc/dialmgr.hxx
index 637c561..5081385 100644
--- a/cui/source/inc/dialmgr.hxx
+++ b/cui/source/inc/dialmgr.hxx
@@ -34,17 +34,17 @@
// forward ---------------------------------------------------------------
+#define CUI_MGR() (*CuiResMgr::GetResMgr())
+#define CUI_RES(i) ResId(i,CUI_MGR())
+#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
+#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR()))
+
class ResMgr;
struct CuiResMgr
{
static ResMgr* GetResMgr();
};
-#define CUI_MGR() (*CuiResMgr::GetResMgr())
-#define CUI_RES(i) ResId(i,CUI_MGR())
-#define CUI_RESSTR(i) UniString(ResId(i,CUI_MGR()))
-#define CUI_RESSSTR(i) String(ResId(i,CUI_MGR()))
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index ad60687..b1da380 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -31,30 +31,7 @@
#include <svx/dlgctrl.hxx>
#include <vcl/group.hxx>
#include <vcl/fixed.hxx>
-#include <svx/dstribut_enum.hxx> //CHINA001
-/*************************************************************************
-|*
-\************************************************************************/
-
-/*
-enum SvxDistributeHorizontal
-{
- SvxDistributeHorizontalNone = 0,
- SvxDistributeHorizontalLeft,
- SvxDistributeHorizontalCenter,
- SvxDistributeHorizontalDistance,
- SvxDistributeHorizontalRight
-};
-
-enum SvxDistributeVertical
-{
- SvxDistributeVerticalNone = 0,
- SvxDistributeVerticalTop,
- SvxDistributeVerticalCenter,
- SvxDistributeVerticalDistance,
- SvxDistributeVerticalBottom
-};
-*/
+#include <svx/dstribut_enum.hxx>
/*************************************************************************
|*
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 4501a60..7d4d847 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -51,11 +51,10 @@ private:
sal_Bool ImplGetURLObject( const String& rPath, const String& rBase, INetURLObject&
aURLObject ) const;
void FillDocumentList ();
- DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New
+ DECL_LINK (ClickNewHdl_Impl , void * );
Image GetImage( USHORT nId );
- void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL*
pShowAsFolder);//, String* pFrame, String* pOpenAs, String* pDefTempl, String* pDefURL );
- //String ReadURL_Impl( Config& rURLFile, const DirEntry& rFile );
+ void ReadURLFile( const String& rFile, String& rTitle, String& rURL, sal_Int32& rIconId, BOOL*
pShowAsFolder);
protected:
void FillDlgFields ( String& aStrURL );
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 3f657aa..b521edf 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -55,15 +55,15 @@ private:
BOOL mbMarkWndOpen;
- DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen
- DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target
+ DECL_LINK (ClickFileopenHdl_Impl , void * );
+ DECL_LINK (ClickTargetHdl_Impl , void * );
- DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path"
modified
- DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target"
modified
+ DECL_LINK (ModifiedPathHdl_Impl , void * ); // Contens of combobox "Path" modified
+ DECL_LINK (ModifiedTargetHdl_Impl, void * ); // Contens of editfield "Target" modified
- DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus
+ DECL_LINK (LostFocusPathHdl_Impl, void * ); // Combobox "path" lost its focus
- DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout
+ DECL_LINK (TimeoutHdl_Impl , Timer * ); // Handler for timer -timeout
enum EPathType { Type_Unknown, Type_Invalid,
Type_ExistsFile, Type_File,
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index f3f1156..918b062 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -34,7 +34,7 @@
#include <vcl/button.hxx>
#include <svtools/svtreebx.hxx>
-#include "hlmarkwn_def.hxx" //ADD CHINA001
+#include "hlmarkwn_def.hxx"
class SvxHyperlinkTabPageBase;
//########################################################################
@@ -69,7 +69,6 @@ private:
PushButton maBtApply;
PushButton maBtClose;
- //SvTreeListBox maLbTree;
SvxHlmarkTreeLBox maLbTree;
BOOL mbUserMoved;
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index be491bf..a96f3a1 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -83,10 +83,7 @@ class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
private:
BOOL mbAccessAddress;
-// String GetAllEmailNamesFromDragItem( USHORT nItem );
-
protected:
-
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 2bc8810..22cdd4b 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -115,7 +115,6 @@ public:
class SvxCaptionTabDialog : public SfxTabDialog
{
private:
-// const SfxItemSet& rOutAttrs;
const SdrView* pView;
USHORT nAnchorCtrls;
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index afdd26a..d257e6a 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -134,10 +134,6 @@ public:
virtual ~SvxMacroAssignSingleTabDialog();
void SetTabPage( SfxTabPage* pTabPage );
- // SfxTabPage* GetTabPage() const { return pPage; }
-
- // OKButton* GetOKButton() const { return pOKBtn; }
- // CancelButton* GetCancelButton() const { return pCancelBtn; }
private:
SfxViewFrame* pFrame;
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index db01be9..a6a875c 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -105,7 +105,7 @@ public:
void Construct();
void SetView( const SdrView* pSdrView ) { pView = pSdrView; }
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
};
/*************************************************************************
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 255eb4d..0c95554 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -42,13 +42,6 @@
#include <svx/langbox.hxx>
#include <svx/fontlb.hxx>
-//CHINA001 #define SVX_NUMVAL_STANDARD -1234.12345678901234
-//CHINA001 #define SVX_NUMVAL_CURRENCY -1234
-//CHINA001 #define SVX_NUMVAL_PERCENT -0.1295
-//CHINA001 #define SVX_NUMVAL_TIME 36525.5678935185
-//CHINA001 #define SVX_NUMVAL_DATE 36525.5678935185
-//CHINA001 #define SVX_NUMVAL_BOOLEAN 1
-
//------------------------------------------------------------------------
class SvxNumberFormatShell;
@@ -108,7 +101,7 @@ public:
void SetOkHdl( const Link& rOkHandler );
void HideLanguage(BOOL nFlag=TRUE);
virtual long PreNotify( NotifyEvent& rNEvt );
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
private:
SvxNumberFormatTabPage( Window* pParent,
const SfxItemSet& rCoreAttrs );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index af53605..9925d09 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -49,9 +49,8 @@ class ValueSet;
class SvxNumberingPreview;
class SvxBrushItem;
-/*-----------------13.02.97 14.02-------------------
---------------------------------------------------*/
+//------------------------------------------------
struct SvxNumSettings_Impl
{
@@ -70,9 +69,8 @@ struct SvxNumSettings_Impl
typedef SvxNumSettings_Impl* SvxNumSettings_ImplPtr;
SV_DECL_PTRARR_DEL(SvxNumSettingsArr_Impl,SvxNumSettings_ImplPtr,8,4)
-/*-----------------07.02.97 11.36-------------------
---------------------------------------------------*/
+//------------------------------------------------
class SvxSingleNumPickTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
@@ -110,9 +108,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage
void SetNumCharFmtName(const String& rName){sNumCharFmtName =
rName;}
};
-/*-----------------07.02.97 11.36-------------------
---------------------------------------------------*/
+//------------------------------------------------
class SvxBulletPickTabPage : public SfxTabPage
{
@@ -146,10 +143,10 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmtName(const String& rName){sBulletCharFmtName =
rName;}
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
-/*-----------------07.02.97 11.36-------------------
+/*--------------------------------------------------
TabPage fuer vollstaendig Numerierung
--------------------------------------------------*/
#define NUMTYPE_MEMBER 4 // Anzahl der Elemente des FormatStrings je Ebene
@@ -194,12 +191,11 @@ class SvxNumPickTabPage : public SfxTabPage
void SetCharFmtNames(const String& rCharName, const String&
rBulName)
{ sNumCharFmtName = rCharName;
sBulletCharFmtName = rBulName;}
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
-/*-----------------12.02.97 07.42-------------------
---------------------------------------------------*/
+//------------------------------------------------
class SvxBitmapPickTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
@@ -242,9 +238,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
void SetNumCharFmtName(const String& rName){sNumCharFmtName =
rName;}
};
-/*-----------------01.12.97 16:13-------------------
-
---------------------------------------------------*/
+//------------------------------------------------
class SvxNumOptionsTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
@@ -350,7 +344,6 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual BOOL FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
-//??? void SetWrtShell(SwWrtShell* pSh);
void SetCharFmts(const String& rNumName, const String&
rBulletName )
{
sNumCharFmtName = rNumName;
@@ -360,12 +353,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
ListBox& GetCharFmtListBox() {return aCharFmtLB;}
void SetModified(BOOL bRepaint = TRUE);
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
-/*-----------------03.12.97 10:18-------------------
-
---------------------------------------------------*/
+//------------------------------------------------
class SvxNumPositionTabPage : public SfxTabPage
{
using TabPage::ActivatePage;
@@ -386,7 +377,6 @@ class SvxNumPositionTabPage : public SfxTabPage
MetricField aDistNumMF;
FixedText aAlignFT;
ListBox aAlignLB;
- // <--
// new set of controls shown for numbering rules containing list level
// attributes in SvxNumberFormat::SvxNumPositionAndSpaceMode == LABEL_ALIGNMENT
@@ -400,7 +390,6 @@ class SvxNumPositionTabPage : public SfxTabPage
MetricField aAlignedAtMF;
FixedText aIndentAtFT;
MetricField aIndentAtMF;
- // <--
PushButton aStandardPB;
@@ -452,7 +441,7 @@ public:
void SetMetric(FieldUnit eSet);
void SetModified(BOOL bRepaint = TRUE);
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
#endif
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index c5b9cca..6b1cfce 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -41,15 +41,6 @@
#include <i18npool/paper.hxx>
#include <svx/flagsdef.hxx>
-// enum ------------------------------------------------------------------
-
-//CHINA001 enum SvxModeType
-//CHINA001 {
-//CHINA001 SVX_PAGE_MODE_STANDARD,
-//CHINA001 SVX_PAGE_MODE_CENTER,
-//CHINA001 SVX_PAGE_MODE_PRESENTATION
-//CHINA001 };
-
// class SvxPageDescPage -------------------------------------------------
/* {k:\svx\prototyp\dialog\page.bmp}
@@ -232,7 +223,7 @@ public:
{ ePaperStart = eStart, ePaperEnd = eEnd; }
void SetCollectionList(const List* pList);
- virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
+ virtual void PageCreated (SfxAllItemSet aSet);
};
#endif // #ifndef _SVX_PAGE_HXX
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index ccca337..d7cf644 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -39,12 +39,6 @@
#include <vcl/lstbox.hxx>
#include <svx/flagsdef.hxx>
-// define ----------------------------------------------------------------
-
-// 1/2 cm in TWIPS
-// wird auch fuer Minimalgrosse der LayFrms aller Arten benutzt
-//CHINA001 #define MM50 283
-
// forward ---------------------------------------------------------------
class SvxLineSpacingItem;
@@ -142,7 +136,7 @@ public:
void EnableAutoFirstLine();
void EnableAbsLineDist(long nMinTwip);
void EnableNegativeMode();
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
// class SvxParaAlignTabPage ------------------------------------------------
@@ -197,7 +191,7 @@ public:
virtual void Reset( const SfxItemSet& rSet );
void EnableJustifyExt();
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
// class SvxExtParagraphTabPage ------------------------------------------
@@ -242,10 +236,8 @@ private:
TriStateBox aHyphenBox;
FixedText aBeforeText;
NumericField aExtHyphenBeforeBox;
-// FixedText aHyphenBeforeLabel;
FixedText aAfterText;
NumericField aExtHyphenAfterBox;
-// FixedText aHyphenAfterLabel;
FixedText aMaxHyphenLabel;
NumericField aMaxHyphenEdit;
FixedLine aExtFL;
@@ -291,11 +283,10 @@ private:
DECL_LINK( PageBreakPosHdl_Impl, ListBox* );
DECL_LINK( PageBreakTypeHdl_Impl, ListBox* );
#endif
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
-/* -----------------------------29.11.00 11:33--------------------------------
- ---------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
class SvxAsianTabPage : public SfxTabPage
{
FixedLine aOptionsFL;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index a8ce19b..2be437f 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -47,13 +47,7 @@
#include <hash_map>
#define OBJTYPE_BASICMANAGER 1L
-//#define OBJTYPE_LIB 2L
-//#define OBJTYPE_MODULE 3L
#define OBJTYPE_METHOD 2L
-//#define OBJTYPE_METHODINOBJ 5L
-//#define OBJTYPE_OBJECT 6L
-//#define OBJTYPE_SUBOBJ 7L
-//#define OBJTYPE_PROPERTY 8L
#define OBJTYPE_SCRIPTCONTAINER 3L
#define OBJTYPE_SFROOT 4L
@@ -215,7 +209,6 @@ protected:
String getListOfChildren( ::com::sun::star::uno::Reference<
com::sun::star::script::browse::XBrowseNode > node, int depth );
void StoreCurrentSelection();
void RestorePreviousSelection();
- //String GetInfo( SbxVariable* pVar );
public:
// prob need another arg in the ctor
@@ -225,7 +218,6 @@ public:
virtual short Execute();
- //DECL_LINK( ActivatePageHdl, TabControl * );
};
class SvxScriptErrorDialog : public VclAbstractDialog
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index c20c353..41fc1a2 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -43,22 +43,6 @@
class TabWin_Impl;
-// define ----------------------------------------------------------------
-
-// Bitfelder f"ur DisableControls()
-//CHINA001 #define TABTYPE_LEFT 0x0001
-//CHINA001 #define TABTYPE_RIGHT 0x0002
-//CHINA001 #define TABTYPE_CENTER 0x0004
-//CHINA001 #define TABTYPE_DEZIMAL 0x0008
-//CHINA001 #define TABTYPE_ALL 0x000F
-//CHINA001
-//CHINA001 #define TABFILL_NONE 0x0010
-//CHINA001 #define TABFILL_POINT 0x0020
-//CHINA001 #define TABFILL_DASHLINE 0x0040
-//CHINA001 #define TABFILL_SOLIDLINE 0x0080
-//CHINA001 #define TABFILL_SPECIAL 0x0100
-//CHINA001 #define TABFILL_ALL 0x01F0
-
// class SvxTabulatorTabPage ---------------------------------------------
/*
{k:\svx\prototyp\dialog\tabstop.bmp}
@@ -152,7 +136,7 @@ private:
DECL_LINK( GetFillCharHdl_Impl, Edit* );
DECL_LINK( GetDezCharHdl_Impl, Edit* );
#endif
- virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
+ virtual void PageCreated(SfxAllItemSet aSet);
};
#endif // #ifndef _SVX_TABSTPGE_HXX
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 0c6961d..db05825 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -51,7 +51,6 @@ private:
FixedLine aFlEffect;
FixedText aFtEffects;
ListBox aLbEffect;
- //ValueSet aCtlEffect;
FixedText aFtDirection;
ImageButton aBtnUp;
ImageButton aBtnLeft;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 6083a0d..9e4d093 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -149,8 +149,6 @@ private:
DECL_LINK( ChangeSizeProtectHdl, void * );
DECL_LINK( ChangePosXHdl, void * );
DECL_LINK( ChangePosYHdl, void * );
-// DECL_LINK( SetAnchorHdl, ListBox * );
-// DECL_LINK( SetOrientHdl, ListBox * );
void SetMinMaxPosition();
void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange);
@@ -183,7 +181,6 @@ public:
void Construct();
void SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
-// void ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen
virtual void FillUserData();
void DisableResize();
@@ -263,11 +260,9 @@ private:
FixedLine aFlRadius;
FixedText aFtRadius;
MetricField aMtrRadius;
- //TriStateBox aTsbVertical;
FixedLine aFlAngle;
FixedText aFtAngle;
MetricField aMtrAngle;
- //SvxRectCtl aCtlAngle;
const SfxItemSet& rOutAttrs;
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 27c13d5..c209457 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -44,7 +44,6 @@ CreateTabPage GetSSOCreator( void );
// class OfaOptionsTreeListBox -------------------------------------------
-//!#define NUMBER_OF_OPTION_PAGES 12
class SfxModule;
class SfxShell;
class SfxItemSet;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index c476a9b..e36bac1 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -107,7 +107,6 @@ namespace offapp
//--------------------------------------------------------------------
DriverListControl::DriverListControl( Window* _pParent, const ResId& _rId)
-// :DriverListControl_Base(_pParent, _rId, DBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL |
BROWSER_AUTO_HSCROLL | BROWSER_COLUMNSELECTION | BROWSER_HLINESFULL | BROWSER_VLINESFULL |
BROWSER_HIDESELECT | BROWSER_CURSOR_WO_FOCUS)
:DriverListControl_Base(_pParent, _rId, EBBF_NOROWPICTURE, BROWSER_AUTO_VSCROLL |
BROWSER_AUTO_HSCROLL | BROWSER_HIDECURSOR | BROWSER_AUTOSIZE_LASTCOL)
,m_aSeekRow(m_aSettings.end())
,m_sYes(ResId(STR_YES,*_rId.GetResMgr()))
diff --git a/cui/source/options/dbregister.src b/cui/source/options/dbregister.src
index 7da5388..4f9056f 100644
--- a/cui/source/options/dbregister.src
+++ b/cui/source/options/dbregister.src
@@ -34,7 +34,6 @@
#define STD_MASKCOLOR Color { Red=0xffff; Green=0x0000; Blue=0xffff; }
TabPage RID_SFXPAGE_DBREGISTER
{
- // HelpId = HID_OPTIONS_DBREGISTER ;
OutputSize = TRUE ;
SVLook = TRUE ;
Hide = TRUE ;
diff --git a/cui/source/options/doclinkdialog.cxx b/cui/source/options/doclinkdialog.cxx
index b0abcda..fd0aaf9 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -83,7 +83,6 @@ namespace svx
validate();
- // m_aURL.SetHelpId( HID_DOCLINKEDIT_URL );
m_aURL.SetDropDownLineCount( 5 );
}
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 617c18f..8f296cb 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -137,7 +137,6 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
sHeader += sHeader3;
sHeader += sTabSpace;
sHeader += sHeader4;
-// sHeader += sTabSpace;
aCheckLB.InsertHeaderEntry(sHeader);
HeaderBar* pBar = aCheckLB.GetTheHeaderBar();
@@ -377,9 +376,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
return 0;
}
-/* -----------------------------29.08.2002 11:47------------------------------
- ---------------------------------------------------------------------------*/
+//--------------------------------------------------------------------------
IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
{
String sFontName = aFontNameLB.GetSelectEntry();
@@ -397,9 +395,6 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
aFontNameLB.SelectEntry(sFontName);
return 0;
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
void SvxFontSubstTabPage::CheckEnable()
{
@@ -415,14 +410,6 @@ void SvxFontSubstTabPage::CheckEnable()
sEntry += '\t';
sEntry += aFont2CB.GetText();
-/* if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len() ||
- aFont1CB.GetText() == aFont2CB.GetText() ||
- aCheckLB.GetEntryPos(sEntry) != 0xffffffff ||
- (pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0))
- bApply = FALSE;
- else
- bApply = TRUE;*/
-
// Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher:
if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
bApply = FALSE;
@@ -468,10 +455,6 @@ void SvxFontSubstTabPage::CheckEnable()
aFont2CB.Enable(bEnableAll);
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
void SvxFontSubstCheckListBox::SetTabs()
{
SvxSimpleTable::SetTabs();
@@ -485,9 +468,7 @@ void SvxFontSubstCheckListBox::SetTabs()
pTab->nFlags &= ~nAdjust;
pTab->nFlags |= SV_LBOXTAB_PUSHABLE|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_FORCE;
}
-/* -----------------------------22.05.2002 11:06------------------------------
- ---------------------------------------------------------------------------*/
void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
{
if(!rKEvt.GetKeyCode().GetModifier() &&
@@ -515,10 +496,6 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
SvxSimpleTable::KeyInput(rKEvt);
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
{
if ( nPos < GetEntryCount() )
@@ -529,10 +506,6 @@ void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL
bChec
SvButtonState( SV_BUTTON_UNCHECKED ) );
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked)
{
if ( pEntry )
@@ -543,28 +516,16 @@ void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol,
BOOL
SvButtonState( SV_BUTTON_UNCHECKED ) );
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
BOOL SvxFontSubstCheckListBox::IsChecked(ULONG nPos, USHORT nCol)
{
return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED;
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
BOOL SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, USHORT nCol)
{
return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED;
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol,
SvButtonState eState)
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -590,10 +551,6 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT
}
}
-/*********************************************************************/
-/* */
-/*********************************************************************/
-
SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol )
const
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
diff --git a/cui/source/options/fontsubs.hrc b/cui/source/options/fontsubs.hrc
index 73830cf..a190b58 100644
--- a/cui/source/options/fontsubs.hrc
+++ b/cui/source/options/fontsubs.hrc
@@ -39,7 +39,6 @@
#define TBX_SUBSTNEWDEL 6
#define BT_SUBSTAPPLY 7
#define BT_SUBSTDELETE 8
-//#define BT_SUBSTINFO 9
#define STR_HEADER1 10
#define STR_HEADER2 11
@@ -58,5 +57,3 @@
#define STR_AUTOMATIC 28
#endif
-
-
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index e02bb70..4562c6d 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -122,15 +122,4 @@ public:
#endif // _SVX_FONT_SUBSTITUTION_HXX
-
-
-
-
-
-
-
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/fontsubs.src b/cui/source/options/fontsubs.src
index 0d4bce1..ed170fb 100644
--- a/cui/source/options/fontsubs.src
+++ b/cui/source/options/fontsubs.src
@@ -36,10 +36,6 @@
/**************************************************************************/
-/* */
-/* */
-/* */
-/**************************************************************************/
TabPage RID_SVX_FONT_SUBSTITUTION
{
diff --git a/cui/source/options/internationaloptions.cxx
b/cui/source/options/internationaloptions.cxx
index 96afb1a..b790c07 100644
--- a/cui/source/options/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -99,11 +99,6 @@ namespace offapp
m_aRB_TxtDirLeft2Right.IsChecked() ),
SID_ATTR_PARA_LEFT_TO_RIGHT );
- // handling of SheetView stuff
-// if( m_bEnable_SheetView_Opt )
-// {
-// }
-
return TRUE;
}
@@ -117,13 +112,6 @@ namespace offapp
BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue()
: TRUE;
m_aRB_TxtDirLeft2Right.Check( bLeft2Right );
- // handling of SheetView stuff
-// if( m_bEnable_SheetView_Opt )
-// {
-// m_aCB_ShtVwRight2Left.Check( FALSE );
-//
-// m_aCB_ShtVwCurrentDocOnly.Check( FALSE );
-// }
}
InternationalOptionsPage::InternationalOptionsPage( Window* _pParent, const SfxItemSet&
_rAttrSet ) :
@@ -142,7 +130,6 @@ namespace offapp
SfxTabPage* InternationalOptionsPage::CreateSc( Window* _pParent, const SfxItemSet& _rAttrSet )
{
InternationalOptionsPage* p = new InternationalOptionsPage( _pParent, _rAttrSet );
-// p->m_pImpl->EnableOption_SheetView();
return p;
}
@@ -161,6 +148,6 @@ namespace offapp
m_pImpl->Reset( _rSet );
}
-} // /namespace offapp
+} // namespace offapp
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/internationaloptions.src
b/cui/source/options/internationaloptions.src
index 9e804b3..a22cc40 100644
--- a/cui/source/options/internationaloptions.src
+++ b/cui/source/options/internationaloptions.src
@@ -80,24 +80,3 @@ TabPage RID_OFA_TP_INTERNATIONAL
Text [ en-US ] = "~Current document only";
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index b0e92a2..bce38f0 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -162,7 +162,6 @@ void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
m_aAnimatedGraphics.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedGraphics() );
m_aAnimatedTexts.Check( m_pImpl->m_aConfig.GetIsAllowAnimatedText() );
m_aAutomaticFontColor.Check( m_pImpl->m_aConfig.GetIsAutomaticFontColor() );
-// m_aSystemFont.Check( m_pImpl->m_aConfig.GetIsSystemFont() );
m_aTextSelectionInReadonly.Check( m_pImpl->m_aConfig.IsSelectionInReadonly() );
m_aAutoDetectHC.Check( m_pImpl->m_aConfig.GetAutoDetectSystemHC() );
diff --git a/cui/source/options/optaccessibility.hrc b/cui/source/options/optaccessibility.hrc
index acb1d37..d60a528 100644
--- a/cui/source/options/optaccessibility.hrc
+++ b/cui/source/options/optaccessibility.hrc
@@ -64,8 +64,6 @@
#define DIFF(v1,v2) (v2-v1)
#define SUM(v1,v2) (v2+v1)
-//
-
#define FL_MISCELLANEOUS 1
#define CB_PAGE_PREVIEWS 2
#define FL_HC_OPTIONS 3
diff --git a/cui/source/options/optaccessibility.src b/cui/source/options/optaccessibility.src
index 36a4cad..bb9348f 100644
--- a/cui/source/options/optaccessibility.src
+++ b/cui/source/options/optaccessibility.src
@@ -125,28 +125,3 @@ TabPage RID_SVXPAGE_ACCESSIBILITYCONFIG
Text [ en-US ] = "~Use system colors for page previews";
};
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 7137519..f00dadf 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -92,9 +92,7 @@ struct SvxAsianLayoutPage_Impl
SvxForbiddenChars_Impl* getForbiddenCharacters(LanguageType eLang);
void addForbiddenCharacters(LanguageType eLang,
ForbiddenCharacters* pForbidden);
};
-/* -----------------------------24.01.01 14:50--------------------------------
- ---------------------------------------------------------------------------*/
SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
{
for( SvxForbiddenChars_Impl* pDel = First(); pDel; pDel = Next() )
@@ -103,16 +101,12 @@ SvxForbiddenCharacterTable_Impl::~SvxForbiddenCharacterTable_Impl()
delete pDel;
}
}
-/* -----------------------------24.01.01 14:50--------------------------------
- ---------------------------------------------------------------------------*/
sal_Bool SvxAsianLayoutPage_Impl::hasForbiddenCharacters(LanguageType eLang)
{
return 0 != aChangedLanguagesTbl.Get(eLang);
}
-/* -----------------------------24.01.01 14:50--------------------------------
- ---------------------------------------------------------------------------*/
SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(LanguageType eLang)
{
SvxForbiddenChars_Impl* pImp = aChangedLanguagesTbl.Get(eLang);
@@ -121,9 +115,7 @@ SvxForbiddenChars_Impl* SvxAsianLayoutPage_Impl::getForbiddenCharacters(Language
return pImp;
return 0;
}
-/* -----------------------------24.01.01 14:50--------------------------------
- ---------------------------------------------------------------------------*/
void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
LanguageType eLang, ForbiddenCharacters* pForbidden)
{
@@ -143,9 +135,7 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
}
}
-/*-- 09.01.01 13:29:02---------------------------------------------------
- -----------------------------------------------------------------------*/
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters = USHRT_MAX;
SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet ) :
@@ -178,23 +168,17 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet&
rSet
aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, FALSE, FALSE );
}
-/*-- 09.01.01 13:29:02---------------------------------------------------
- -----------------------------------------------------------------------*/
SvxAsianLayoutPage::~SvxAsianLayoutPage()
{
delete pImpl;
}
-/*-- 09.01.01 13:29:02---------------------------------------------------
- -----------------------------------------------------------------------*/
SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttrSet )
{
return new SvxAsianLayoutPage(pParent, rAttrSet);
}
-/*-- 09.01.01 13:29:03---------------------------------------------------
- -----------------------------------------------------------------------*/
BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
{
if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue())
@@ -251,9 +235,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
return FALSE;
}
-/*-- 09.01.01 13:29:03---------------------------------------------------
- -----------------------------------------------------------------------*/
void SvxAsianLayoutPage::Reset( const SfxItemSet& )
{
SfxViewFrame* pCurFrm = SfxViewFrame::Current();
@@ -340,9 +322,7 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
aLanguageLB.SelectLanguage( eLastUsedLanguageTypeForForbiddenCharacters );
LanguageHdl(&aLanguageLB);
}
-/* -----------------------------17.01.01 11:02--------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
{
//set current value
@@ -408,9 +388,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
return 0;
}
-/* -----------------------------17.01.01 11:02--------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
{
sal_Bool bCheck = pBox->IsChecked();
@@ -422,9 +400,7 @@ IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, CheckBox*, pBox)
ModifyHdl(&aStartED);
return 0;
}
-/* -----------------------------17.01.01 12:26--------------------------------
- ---------------------------------------------------------------------------*/
IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
{
Locale aLocale;
@@ -442,12 +418,10 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
ForbiddenCharacters aSet;
aSet.beginLine = sStart;
aSet.endLine = sEnd;
-// pImpl->xForbidden->setForbiddenCharacters( aLocale, aSet );
pImpl->addForbiddenCharacters(eSelectLanguage, &aSet);
}
else
pImpl->addForbiddenCharacters(eSelectLanguage, 0);
-// pImpl->xForbidden->removeForbiddenCharacters( aLocale );
}
catch(Exception&)
{
@@ -457,9 +431,7 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
pImpl->aConfig.SetStartEndChars( aLocale, bEnable ? &sStart : 0, bEnable ? &sEnd : 0);
return 0;
}
-/*-- 07.09.2007 12:05:09---------------------------------------------------
- -----------------------------------------------------------------------*/
USHORT* SvxAsianLayoutPage::GetRanges()
{
//no items are used
diff --git a/cui/source/options/optasian.src b/cui/source/options/optasian.src
index ee735f9..8dd11b7 100644
--- a/cui/source/options/optasian.src
+++ b/cui/source/options/optasian.src
@@ -136,39 +136,3 @@ TabPage RID_SVXPAGE_ASIAN_LAYOUT
};
Text [ en-US ] = "Proxy";
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--
1.7.3.2
Attachment:
signature.asc
Description: OpenPGP digital signature