summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc/swuiidxmrk.hxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:11 +0200
commit7a9916abd9ead998e6b0b6442bea67827411f4b7 (patch)
tree51da9b48384426b750242e2cd1d26034f2d26cfd /sw/source/ui/inc/swuiidxmrk.hxx
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit a459007bd5e462d85981eaa32e3b970555bcdea6 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:22 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit dce61127f79a7a991ff32208b72e931d2353e1cd Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit a9c85da2fa4919e2520a6db08d3836e00a2b3fa9 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit a79b457b9123b253bdadcb7c7602b8186b30d701 Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit fec902aecf9b4f5cee9d0fa18e502a136bd52595 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit 8f92e60e028df8c0bd32aa3a04f7105d8446bf4a Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:38 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: writer_libreoffice-3.3.0.4
Diffstat (limited to 'sw/source/ui/inc/swuiidxmrk.hxx')
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx198
1 files changed, 99 insertions, 99 deletions
diff --git a/sw/source/ui/inc/swuiidxmrk.hxx b/sw/source/ui/inc/swuiidxmrk.hxx
index 2fb8470d6087..e4a179612fbe 100644
--- a/sw/source/ui/inc/swuiidxmrk.hxx
+++ b/sw/source/ui/inc/swuiidxmrk.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
@@ -52,7 +52,7 @@ class SwWrtShell;
class SwTOXMgr;
class SwTOXMark;
/*--------------------------------------------------------------------
- Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
+ Beschreibung: Markierung fuer Verzeichniseintrag einfuegen
--------------------------------------------------------------------*/
class SwIndexMarkFloatDlg;
class SwIndexMarkModalDlg;
@@ -61,66 +61,66 @@ class SwIndexMarkDlg : public Window
{
friend class SwIndexMarkFloatDlg;
friend class SwIndexMarkModalDlg;
- FixedText aTypeFT;
- ListBox aTypeDCB;
- ImageButton aNewBT;
-
- FixedText aEntryFT;
- Edit aEntryED;
- FixedText aPhoneticFT0;
- Edit aPhoneticED0;
-
- FixedText aKeyFT;
- ComboBox aKeyDCB;
- FixedText aPhoneticFT1;
- Edit aPhoneticED1;
-
- FixedText aKey2FT;
- ComboBox aKey2DCB;
- FixedText aPhoneticFT2;
- Edit aPhoneticED2;
-
- FixedText aLevelFT;
- NumericField aLevelED;
- CheckBox aMainEntryCB;
- CheckBox aApplyToAllCB;
- CheckBox aSearchCaseSensitiveCB;
- CheckBox aSearchCaseWordOnlyCB;
+ FixedText aTypeFT;
+ ListBox aTypeDCB;
+ ImageButton aNewBT;
+
+ FixedText aEntryFT;
+ Edit aEntryED;
+ FixedText aPhoneticFT0;
+ Edit aPhoneticED0;
+
+ FixedText aKeyFT;
+ ComboBox aKeyDCB;
+ FixedText aPhoneticFT1;
+ Edit aPhoneticED1;
+
+ FixedText aKey2FT;
+ ComboBox aKey2DCB;
+ FixedText aPhoneticFT2;
+ Edit aPhoneticED2;
+
+ FixedText aLevelFT;
+ NumericField aLevelED;
+ CheckBox aMainEntryCB;
+ CheckBox aApplyToAllCB;
+ CheckBox aSearchCaseSensitiveCB;
+ CheckBox aSearchCaseWordOnlyCB;
FixedLine aIndexFL;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
- PushButton aDelBT;
- //PushButton aNewBT;
-
- ImageButton aPrevSameBT;
- ImageButton aNextSameBT;
- ImageButton aPrevBT;
- ImageButton aNextBT;
-
- String aOrgStr;
- sal_Int32 nOptionsId;
- sal_Bool bDel;
- sal_Bool bNewMark;
- sal_Bool bSelected;
-
- BOOL bPhoneticED0_ChangedByUser;
- BOOL bPhoneticED1_ChangedByUser;
- BOOL bPhoneticED2_ChangedByUser;
- LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
- BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+ PushButton aDelBT;
+ //PushButton aNewBT;
+
+ ImageButton aPrevSameBT;
+ ImageButton aNextSameBT;
+ ImageButton aPrevBT;
+ ImageButton aNextBT;
+
+ String aOrgStr;
+ sal_Int32 nOptionsId;
+ sal_Bool bDel;
+ sal_Bool bNewMark;
+ sal_Bool bSelected;
+
+ BOOL bPhoneticED0_ChangedByUser;
+ BOOL bPhoneticED1_ChangedByUser;
+ BOOL bPhoneticED2_ChangedByUser;
+ LanguageType nLangForPhoneticReading; //Language of current text used for phonetic reading proposal
+ BOOL bIsPhoneticReadingEnabled; //this value states wether phopentic reading is enabled in principle dependend of global cjk settings and language of current entry
com::sun::star::uno::Reference< com::sun::star::i18n::XExtendedIndexEntrySupplier >
xExtendedIndexEntrySupplier;
- SwTOXMgr* pTOXMgr;
- SwWrtShell* pSh;
+ SwTOXMgr* pTOXMgr;
+ SwWrtShell* pSh;
- void Apply();
- void InitControls();
- void InsertMark();
- void UpdateMark();
+ void Apply();
+ void InitControls();
+ void InsertMark();
+ void UpdateMark();
DECL_LINK( InsertHdl, Button * );
DECL_LINK( CloseHdl, Button * );
@@ -138,15 +138,15 @@ class SwIndexMarkDlg : public Window
//this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled'
//it needs to be called ones if this dialog is opened to create a new entry (in InitControls),
//or otherwise it has to be called for each changed TOXMark (in UpdateDialog)
- void UpdateLanguageDependenciesForPhoneticReading();
- String GetDefaultPhoneticReading( const String& rText );
+ void UpdateLanguageDependenciesForPhoneticReading();
+ String GetDefaultPhoneticReading( const String& rText );
- void UpdateKeyBoxes();
+ void UpdateKeyBoxes();
- void UpdateDialog();
- void InsertUpdate();
+ void UpdateDialog();
+ void InsertUpdate();
- virtual void Activate();
+ virtual void Activate();
public:
@@ -160,72 +160,72 @@ public:
~SwIndexMarkDlg();
void ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark = 0);
- sal_Bool IsTOXType(const String& rName)
+ sal_Bool IsTOXType(const String& rName)
{return LISTBOX_ENTRY_NOTFOUND != aTypeDCB.GetEntryPos(rName);}
};
class SwIndexMarkFloatDlg : public SfxModelessDialog
{
- SwIndexMarkDlg aDlg;
- virtual void Activate();
+ SwIndexMarkDlg aDlg;
+ virtual void Activate();
public:
- SwIndexMarkFloatDlg( SfxBindings* pBindings,
+ SwIndexMarkFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True);
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwIndexMarkModalDlg : public SvxStandardDialog
{
- SwIndexMarkDlg aDlg;
+ SwIndexMarkDlg aDlg;
public:
SwIndexMarkModalDlg(Window *pParent, SwWrtShell& rSh, SwTOXMark* pCurTOXMark);
- virtual void Apply();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ virtual void Apply();
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkModalDlg;
class SwAuthMarkDlg : public Window
{
- static sal_Bool bIsFromComponent;
+ static sal_Bool bIsFromComponent;
friend class SwAuthMarkModalDlg;
friend class SwAuthMarkFloatDlg;
RadioButton aFromComponentRB;
- RadioButton aFromDocContentRB;
- FixedText aAuthorFT;
- FixedInfo aAuthorFI;
- FixedText aTitleFT;
- FixedInfo aTitleFI;
- FixedText aEntryFT;
- Edit aEntryED;
- ListBox aEntryLB;
+ RadioButton aFromDocContentRB;
+ FixedText aAuthorFT;
+ FixedInfo aAuthorFI;
+ FixedText aTitleFT;
+ FixedInfo aTitleFI;
+ FixedText aEntryFT;
+ Edit aEntryED;
+ ListBox aEntryLB;
FixedLine aEntryFL;
- OKButton aOKBT;
- CancelButton aCancelBT;
- HelpButton aHelpBT;
- PushButton aCreateEntryPB;
- PushButton aEditEntryPB;
+ OKButton aOKBT;
+ CancelButton aCancelBT;
+ HelpButton aHelpBT;
+ PushButton aCreateEntryPB;
+ PushButton aEditEntryPB;
- String sChangeST;
- sal_Bool bNewEntry;
- sal_Bool bBibAccessInitialized;
+ String sChangeST;
+ sal_Bool bNewEntry;
+ sal_Bool bBibAccessInitialized;
- SwWrtShell* pSh;
+ SwWrtShell* pSh;
- String m_sColumnTitles[AUTH_FIELD_END];
- String m_sFields[AUTH_FIELD_END];
+ String m_sColumnTitles[AUTH_FIELD_END];
+ String m_sFields[AUTH_FIELD_END];
- String m_sCreatedEntry[AUTH_FIELD_END];
+ String m_sCreatedEntry[AUTH_FIELD_END];
- ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess;
+ ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xBibAccess;
DECL_LINK(InsertHdl, PushButton*);
DECL_LINK(CloseHdl, PushButton*);
@@ -244,30 +244,30 @@ public:
sal_Bool bNew=sal_True);
~SwAuthMarkDlg();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkFloatDlg : public SfxModelessDialog
{
- SwAuthMarkDlg aDlg;
- virtual void Activate();
+ SwAuthMarkDlg aDlg;
+ virtual void Activate();
public:
- SwAuthMarkFloatDlg( SfxBindings* pBindings,
+ SwAuthMarkFloatDlg( SfxBindings* pBindings,
SfxChildWindow* pChild,
Window *pParent,
SfxChildWinInfo* pInfo,
sal_Bool bNew=sal_True);
- void ReInitDlg(SwWrtShell& rWrtShell);
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
class SwAuthMarkModalDlg : public SvxStandardDialog
{
- SwAuthMarkDlg aDlg;
+ SwAuthMarkDlg aDlg;
public:
SwAuthMarkModalDlg(Window *pParent, SwWrtShell& rSh);
- virtual void Apply();
- void ReInitDlg(SwWrtShell& rWrtShell);
+ virtual void Apply();
+ void ReInitDlg(SwWrtShell& rWrtShell);
};
#endif // _SWUI_IDXMRK_HXX