summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Poussel <gpoussel@gmail.com>2011-02-08 08:49:52 +0100
committerCédric Bosdonnat <cedricbosdo@openoffice.org>2011-02-08 19:04:44 +0100
commit48c6d8dfd592bb6e6692d209caf19e230d7d3831 (patch)
treeb287d4932dc83964d2c73640b964a42885bf5eae
parent4d94306389349a57b50523a692f261de7e2489d4 (diff)
Remove few bogus comments.
-rw-r--r--svx/inc/flagsdef.hxx18
-rw-r--r--svx/source/dialog/imapwnd.hxx34
-rw-r--r--svx/source/inc/fmsrcimp.hxx6
-rw-r--r--svx/source/svdraw/svdedxv.cxx3
4 files changed, 13 insertions, 48 deletions
diff --git a/svx/inc/flagsdef.hxx b/svx/inc/flagsdef.hxx
index 7956e9e2cc35..b9708bf20dac 100644
--- a/svx/inc/flagsdef.hxx
+++ b/svx/inc/flagsdef.hxx
@@ -30,22 +30,22 @@
// defines ---------------------------------------------------------------
-//CHINA001 copy from border.hxx
+// copy from border.hxx
// Border-Modes for paragraphs, textframes and tables
#define SW_BORDER_MODE_PARA 0x01
#define SW_BORDER_MODE_TABLE 0x02
#define SW_BORDER_MODE_FRAME 0x04
-//CHINA001 flags for SvxBackgroundTabPage
+// flags for SvxBackgroundTabPage
#define SVX_SHOW_SELECTOR 0x01
#define SVX_SHOW_PARACTL 0x02
#define SVX_ENABLE_TRANSPARENCY 0x04
#define SVX_SHOW_TBLCTL 0x08
-//CHINA001 flags for SvxBorderTabPage
+// flags for SvxBorderTabPage
#define SVX_HIDESHADOWCTL 0x01
-//CHINA001 copy from chardlg.hxx
+// copy from chardlg.hxx
#define DISABLE_CASEMAP ((USHORT)0x0001)
#define DISABLE_WORDLINE ((USHORT)0x0002)
#define DISABLE_BLINK ((USHORT)0x0004)
@@ -54,15 +54,15 @@
#define DISABLE_LANGUAGE ((USHORT)0x0010)
#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020)
-//CHINA001 flags for SvxCharBasePage's child class
+// flags for SvxCharBasePage's child class
#define SVX_PREVIEW_CHARACTER 0x01
-//CHINA001 flags for SvxCharNamePage
+// flags for SvxCharNamePage
#define SVX_RELATIVE_MODE 0x02
-//CHINA001 flags for SvxCharEffectsPage
+// flags for SvxCharEffectsPage
#define SVX_ENABLE_FLASH 0x04
-//CHINA001 copy from numfmt.hxx
+// copy from numfmt.hxx
#define SVX_NUMVAL_STANDARD -1234.12345678901234
#define SVX_NUMVAL_CURRENCY -1234
#define SVX_NUMVAL_PERCENT -0.1295
@@ -70,7 +70,7 @@
#define SVX_NUMVAL_DATE 36525.5678935185
#define SVX_NUMVAL_BOOLEAN 1
-//CHINA001 copy from page.hxx
+// copy from page.hxx
// enum ------------------------------------------------------------------
enum SvxModeType
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index a6dad611053c..fbf36a49c55f 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.hxx
@@ -117,40 +117,6 @@ public:
|*
|*
\************************************************************************/
-/* move to cui //CHINA001
-class URLDlg : public ModalDialog
-{
- FixedLine aFlURL;
- FixedText aFtURL1;
- Edit aEdtURL;
- FixedText aFtURLDescription;
- Edit aEdtURLDescription;
- FixedText aFtTarget;
- ComboBox aCbbTargets;
- FixedText aFtName;
- Edit aEdtName;
- OKButton aBtnOk;
- CancelButton aBtnCancel;
-
-public:
-
- URLDlg( Window* pWindow,
- const String& rURL, const String& rDescription,
- const String& rTarget, const String& rName,
- TargetList& rTargetList );
-
- String GetURL() const { return aEdtURL.GetText(); }
- String GetDescription() const { return aEdtURLDescription.GetText(); }
- String GetTarget() const { return aCbbTargets.GetText(); }
- String GetName() const { return aEdtName.GetText(); }
-};
-*/
-
-/*************************************************************************
-|*
-|*
-|*
-\************************************************************************/
class IMapWindow : public GraphCtrl, public DropTargetHelper
{
diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/source/inc/fmsrcimp.hxx
index 8063c4f22cbe..102cc2bf4d9c 100644
--- a/svx/source/inc/fmsrcimp.hxx
+++ b/svx/source/inc/fmsrcimp.hxx
@@ -236,7 +236,7 @@ class SVX_DLLPUBLIC FmSearchEngine
sal_Bool m_bCancelAsynchRequest : 1; // soll abgebrochen werden ?
::osl::Mutex m_aCancelAsynchAccess; // Zugriff auf m_bCancelAsynchRequest (eigentlich nur bei
// m_eMode == SM_USETHREAD interesant)
- FMSEARCH_MODE m_eMode; //CHINA001 FmSearchDialog::SEARCH_MODE m_eMode; // der aktuelle Modus
+ FMSEARCH_MODE m_eMode; // der aktuelle Modus
// der aktuelle Modus
// Parameter fuer die Suche
@@ -319,13 +319,13 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor,
const ::rtl::OUString& strVisibleFields,
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xFormat,
- FMSEARCH_MODE eMode);//CHINA001 FmSearchDialog::SEARCH_MODE eMode);
+ FMSEARCH_MODE eMode);
FmSearchEngine(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& xCursor,
const ::rtl::OUString& strVisibleFields,
const InterfaceArray& arrFields,
- FMSEARCH_MODE eMode); //CHINA001 FmSearchDialog::SEARCH_MODE eMode);
+ FMSEARCH_MODE eMode);
virtual ~FmSearchEngine();
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 20590c2d1ad3..4b01dc861e82 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -73,9 +73,8 @@
#include <editeng/outliner.hxx>
#include <editeng/adjitem.hxx>
-// #98988#
#include <svtools/colorcfg.hxx>
-#include <vcl/svapp.hxx> //add CHINA001
+#include <vcl/svapp.hxx>
#include <sdrpaintwindow.hxx>
////////////////////////////////////////////////////////////////////////////////////////////////////