diff options
132 files changed, 2493 insertions, 609 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx index 957b0a508bd8..957b0a508bd8 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControl.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx index 3bdd5abe8912..3bdd5abe8912 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlBase.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx index b45ad5bdae5a..b45ad5bdae5a 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeader.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx index 648614a9e214..648614a9e214 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx index 8058594d2938..8058594d2938 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTable.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx index 35b7a69f5aa6..35b7a69f5aa6 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableBase.hxx diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx index dd44927d7fc1..dd44927d7fc1 100755..100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlTableCell.hxx diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index e8111657d7d0..e8111657d7d0 100755..100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 12d4a7d141a4..12d4a7d141a4 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index c7622c18981e..c7622c18981e 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 485c57c40ae1..485c57c40ae1 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index efd78fc8634a..efd78fc8634a 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 8a7e3102bdf7..8a7e3102bdf7 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index f511eb43cbf8..f511eb43cbf8 100755..100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx diff --git a/automation/source/simplecm/simplecm.cxx b/automation/source/simplecm/simplecm.cxx index 46747ec66f00..92642e8cd7c5 100644 --- a/automation/source/simplecm/simplecm.cxx +++ b/automation/source/simplecm/simplecm.cxx @@ -276,9 +276,9 @@ SvStream* SimpleCommunicationLinkViaSocket::GetBestCommunicationStream() BOOL SimpleCommunicationLinkViaSocket::DoReceiveDataStream() { BOOL bWasError = FALSE; - char* pBuffer = NULL; + void* pBuffer = NULL; comm_UINT32 nLen; - bWasError = pPacketHandler->ReceiveData( (void* &)pBuffer, nLen ) != C_ERROR_NONE; + bWasError = pPacketHandler->ReceiveData( pBuffer, nLen ) != C_ERROR_NONE; if ( !bWasError ) { pReceiveStream = GetBestCommunicationStream(); diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 04e4522be813..461dff80b13d 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -883,7 +883,8 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B if ( !pUIds ) return; pNewDef = new ControlDef("Active",SmartId(0)); - if (! pUIds->C40_PTR_INSERT(ControlItem, (ControlItem*&)pNewDef)) + const ControlItem *pItem = pNewDef; + if (! pUIds->Insert(pItem)) { ADD_WARNING_LOG2( GEN_RES_STR1c( S_DOUBLE_NAME, "Active" ), Filename, nLineNr ); delete pNewDef; @@ -990,7 +991,8 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B OldTree = (ControlDef*)pNames->GetObject(nElement); pNewDef = new ControlDef(aLongname,aShortname,OldTree,TRUE); - if (! pNames->C40_PTR_INSERT(ControlItem, (ControlItem*&)pNewDef)) + const ControlItem *pItem = pNewDef; + if (! pNames->Insert(pItem)) { ADD_WARNING_LOG2( GEN_RES_STR1( S_DOUBLE_NAME, aLine ), Filename, nLineNr ); delete pNewDef; @@ -1057,7 +1059,8 @@ void TestToolObj::ReadNames( String Filename, CNames *&pNames, CNames *&pUIds, B } } - if (! pNames->C40_PTR_INSERT(ControlItem, (ControlItem*&)pNewDef)) + const ControlItem *pItem = pNewDef; + if (! pNames->Insert(pItem)) { ADD_WARNING_LOG2( GEN_RES_STR1( S_DOUBLE_NAME, aLine ), Filename, nLineNr ); delete pNewDef; @@ -1532,7 +1535,8 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr } } - if (! pNames->C40_PTR_INSERT(ControlItem, (ControlItem*&)pNewDef)) + const ControlItem *pItem = pNewDef; + if (! pNames->Insert(pItem)) { DBG_ERROR(" !!!! ACHTUNG !!!! Fehler beim einf�gen eines namens!"); delete pNewDef; diff --git a/automation/source/testtool/objtest.hxx b/automation/source/testtool/objtest.hxx index 435cb0a2e787..d82e4626a4d2 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -136,7 +136,7 @@ DBG_DTOR(ControlItem,0); SV_DECL_PTRARR_SORT_DEL(CNames, ControlItem*, 50, 10) #define MK_SON_ACCESS( ClassName )\ - BOOL SonInsert( const ClassName *pNewEntry ) { return pSons->C40_PTR_INSERT( ControlItem, (ControlItem*&)pNewEntry ); }\ + BOOL SonInsert( const ClassName *pNewEntry ) { const ControlItem *pItem = pNewEntry; return pSons->Insert( pItem ); }\ BOOL SonSeek_Entry( const ClassName *pSearchEntry, USHORT *nRes = NULL) { return pSons->Seek_Entry( pSearchEntry, nRes ); }\ ClassName* SonGetObject( USHORT nNr ) { return (ClassName*)pSons->GetObject( nNr ); } diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index d50f85f5549c..bb44f8d15f7e 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -160,47 +160,47 @@ #define ITEMID_LINE 0 #define ITEMID_BRUSH 0 -#include "svx/srchitem.hxx" -#include "svx/flstitem.hxx" -#include "svx/fontitem.hxx" -#include "svx/postitem.hxx" -#include "svx/wghtitem.hxx" -#include "svx/fhgtitem.hxx" -#include "svx/fwdtitem.hxx" -#include "svx/udlnitem.hxx" -#include "svx/crsditem.hxx" -#include "svx/shdditem.hxx" -#include "svx/akrnitem.hxx" -#include "svx/wrlmitem.hxx" -#include "svx/cntritem.hxx" -#include "svx/prszitem.hxx" -#include "svx/colritem.hxx" -#include "svx/cscoitem.hxx" -#include "svx/kernitem.hxx" - -#include "svx/cmapitem.hxx" -#include "svx/escpitem.hxx" -#include "svx/langitem.hxx" -#include "svx/nlbkitem.hxx" -#include "svx/nhypitem.hxx" -#include "svx/lcolitem.hxx" -#include "svx/blnkitem.hxx" - -#include "svx/pbinitem.hxx" -#include "svx/sizeitem.hxx" -#include "svx/lrspitem.hxx" -#include "svx/ulspitem.hxx" -#include "svx/prntitem.hxx" -#include "svx/opaqitem.hxx" -#include "svx/protitem.hxx" -#include "svx/shaditem.hxx" -#include "svx/boxitem.hxx" -#include "svx/brkitem.hxx" -#include "svx/keepitem.hxx" -#include "svx/bolnitem.hxx" -#include "svx/brshitem.hxx" +#include "svl/srchitem.hxx" +#include "editeng/flstitem.hxx" +#include "editeng/fontitem.hxx" +#include "editeng/postitem.hxx" +#include "editeng/wghtitem.hxx" +#include "editeng/fhgtitem.hxx" +#include "editeng/fwdtitem.hxx" +#include "editeng/udlnitem.hxx" +#include "editeng/crsditem.hxx" +#include "editeng/shdditem.hxx" +#include "editeng/akrnitem.hxx" +#include "editeng/wrlmitem.hxx" +#include "editeng/cntritem.hxx" +#include "editeng/prszitem.hxx" +#include "editeng/colritem.hxx" +#include "editeng/cscoitem.hxx" +#include "editeng/kernitem.hxx" + +#include "editeng/cmapitem.hxx" +#include "editeng/escpitem.hxx" +#include "editeng/langitem.hxx" +#include "editeng/nlbkitem.hxx" +#include "editeng/nhypitem.hxx" +#include "editeng/lcolitem.hxx" +#include "editeng/blnkitem.hxx" + +#include "editeng/pbinitem.hxx" +#include "editeng/sizeitem.hxx" +#include "editeng/lrspitem.hxx" +#include "editeng/ulspitem.hxx" +#include "editeng/prntitem.hxx" +#include "editeng/opaqitem.hxx" +#include "editeng/protitem.hxx" +#include "editeng/shaditem.hxx" +#include "editeng/boxitem.hxx" +#include "editeng/brkitem.hxx" +#include "editeng/keepitem.hxx" +#include "editeng/bolnitem.hxx" +#include "editeng/brshitem.hxx" #include "svx/xmlsecctrl.hxx" -#include "svx/unolingu.hxx" +#include "editeng/unolingu.hxx" #include "xmlscript/xmldlg_imexp.hxx" diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc index 67140ff4af49..d71a1d26d020 100644 --- a/basctl/sdi/basslots.hrc +++ b/basctl/sdi/basslots.hrc @@ -26,4 +26,4 @@ ************************************************************************/ #include <svx/svxids.hrc> - +#include <editeng/memberids.hrc> diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 72c665df19b0..e56dcda81a9f 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -30,7 +30,7 @@ #include <ide_pch.hxx> - +#include <svx/svxids.hrc> #define GLOBALOVERFLOW2 diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx index 1b981c9dacdf..4ab42fbe97a7 100644 --- a/basctl/source/basicide/basicbox.cxx +++ b/basctl/source/basicide/basicbox.cxx @@ -45,7 +45,7 @@ #include "localizationmgr.hxx" #include "managelang.hxx" #include "dlgresid.hrc" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svtools/langtab.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index a2f7f0887a7c..afbe3daf5be1 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -61,7 +61,7 @@ #include <helpid.hrc> #include <bastype2.hxx> #include <svx/svdview.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx index 507b70e02058..2ff30ed6f2a0 100644 --- a/basctl/source/basicide/ide_pch.hxx +++ b/basctl/source/basicide/ide_pch.hxx @@ -26,6 +26,9 @@ ************************************************************************/ #include <svheader.hxx> +#define ITEMID_SEARCH 0 +#define ITEMID_SIZE 0 + #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> #include <vcl/menu.hxx> @@ -35,6 +38,8 @@ #include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <svl/whiter.hxx> +#include <svl/intitem.hxx> +#include <svl/srchitem.hxx> #define _BASIC_TEXTPORTIONS #include <basic/sbdef.hxx> @@ -60,86 +65,6 @@ #include <sfx2/dinfdlg.hxx> #include <sfx2/docfac.hxx> #include <sfx2/progress.hxx> +#include <editeng/sizeitem.hxx> -#define ITEMID_FONT 0 -#define ITEMID_POSTURE 0 -#define ITEMID_WEIGHT 0 -#define ITEMID_SHADOWED 0 -#define ITEMID_CONTOUR 0 -#define ITEMID_CROSSEDOUT 0 -#define ITEMID_UNDERLINE 0 -#define ITEMID_FONTHEIGHT 0 -#define ITEMID_COLOR 0 -#define ITEMID_ADJUST 0 -#define ITEMID_LINESPACING 0 -#define ITEMID_TABSTOP 0 -#define ITEMID_LRSPACE 0 -#define ITEMID_ULSPACE 0 -#define ITEMID_SEARCH 0 -#define ITEMID_SEARCH 0 -#define ITEMID_SIZE 0 -#define ITEMID_FONTLIST 0 -#define ITEMID_AUTOKERN 0 -#define ITEMID_WORDLINEMODE 0 -#define ITEMID_PROPSIZE 0 -#define ITEMID_CHARSETCOLOR 0 -#define ITEMID_KERNING 0 -#define ITEMID_CASEMAP 0 -#define ITEMID_ESCAPEMENT 0 -#define ITEMID_LANGUAGE 0 -#define ITEMID_NOLINEBREAK 0 -#define ITEMID_NOHYPHENHERE 0 -#define ITEMID_BLINK 0 -#define ITEMID_PAPERBIN 0 -#define ITEMID_PRINT 0 -#define ITEMID_OPAQUE 0 -#define ITEMID_PROTECT 0 -#define ITEMID_SHADOW 0 -#define ITEMID_BOX 0 -#define ITEMID_BOXINFO 0 -#define ITEMID_FMTBREAK 0 -#define ITEMID_FMTKEEP 0 -#define ITEMID_LINE 0 -#define ITEMID_BRUSH 0 - -#include <svx/srchitem.hxx> -#include <svx/flstitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/fwdtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/shdditem.hxx> -#include <svx/akrnitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/prszitem.hxx> -#include <svx/colritem.hxx> -#include <svx/cscoitem.hxx> -#include <svx/kernitem.hxx> - -#include <svx/cmapitem.hxx> -#include <svx/escpitem.hxx> -#include <svx/langitem.hxx> -#include <svx/nlbkitem.hxx> -#include <svx/nhypitem.hxx> -#include <svx/lcolitem.hxx> -#include <svx/blnkitem.hxx> - -#include <svx/pbinitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/prntitem.hxx> -#include <svx/opaqitem.hxx> -#include <svx/protitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/boxitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/keepitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/brshitem.hxx> - diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx index b4d2877e19fa..a15bed689b6f 100644 --- a/basctl/source/basicide/iderdll.cxx +++ b/basctl/source/basicide/iderdll.cxx @@ -53,7 +53,7 @@ #define ITEMID_SEARCH 0 -#include <svx/srchitem.hxx> +#include <svl/srchitem.hxx> #include <com/sun/star/script/XLibraryContainerPassword.hpp> using ::rtl::OUString; diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 57f36dcdc3cc..41c86699203b 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -53,7 +53,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <unotools/localedatawrapper.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svtools/langtab.hxx> diff --git a/basctl/util/makefile.mk b/basctl/util/makefile.mk index 9f2cb576a42e..47de65cc58c0 100644 --- a/basctl/util/makefile.mk +++ b/basctl/util/makefile.mk @@ -50,6 +50,7 @@ SHL1TARGET= basctl$(DLLPOSTFIX) SHL1IMPLIB= basctl SHL1BASE = 0x1d800000 SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFX2LIB) \ diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 6664368aaeb5..d243ce96f27c 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -43,8 +43,8 @@ #include <unotools/lingucfg.hxx> #include <svtools/textdata.hxx> #include <svtools/filter.hxx> -#include <svx/unolingu.hxx> -#include <svx/splwrap.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/splwrap.hxx> #include <linguistic/lngprops.hxx> #include <linguistic/misc.hxx> #include <comphelper/processfactory.hxx> @@ -57,12 +57,11 @@ #include <vcl/help.hxx> #include <vcl/graph.hxx> #include <osl/file.hxx> -#include <svx/impgrf.hxx> #include <cuires.hrc> #include <helpid.hrc> #include "SpellDialog.hrc" -#include <svx/optitems.hxx> -#include <svx/svxenum.hxx> +#include <editeng/optitems.hxx> +#include <editeng/svxenum.hxx> #include <svx/SpellDialogChildWindow.hxx> #include "SpellDialog.hxx" #include <svx/dlgutil.hxx> @@ -70,6 +69,7 @@ #include <dialmgr.hxx> #include <svx/svxerr.hxx> #include "treeopt.hxx" +#include <svtools/langtab.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -884,7 +884,7 @@ static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl ) osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp ); Graphic aGraphic; const String aFilterName( RTL_CONSTASCII_USTRINGPARAM( IMP_PNG ) ); - if( GRFILTER_OK == LoadGraphic( aTmp, aFilterName, aGraphic ) ) + if( GRFILTER_OK == GraphicFilter::LoadGraphic( aTmp, aFilterName, aGraphic ) ) { aRes = Image( aGraphic.GetBitmapEx() ); } @@ -924,7 +924,7 @@ void SpellDialog::SetTitle_Impl(LanguageType nLang) sTitle = m_sTitleSpellingGrammar; } } - sTitle.SearchAndReplaceAscii( "$LANGUAGE ($LOCATION)", ::GetLanguageString(nLang) ); + sTitle.SearchAndReplaceAscii( "$LANGUAGE ($LOCATION)", SvtLanguageTable::GetLanguageString(nLang) ); SetText( sTitle ); } /*------------------------------------------------------------------------- diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx index 645ce5f6b05a..04d9fbcc58e4 100644 --- a/cui/source/dialogs/commonlingui.hxx +++ b/cui/source/dialogs/commonlingui.hxx @@ -31,7 +31,7 @@ #include <vcl/ctrl.hxx> #include <svtools/stdctrl.hxx> #include <vcl/edit.hxx> -#include <svx/svxbox.hxx> +#include <svtools/svxbox.hxx> #ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 86f21009ad32..b8b6d2567a47 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -53,7 +53,7 @@ #include <sfx2/request.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #include "charmap.hrc" #include "macroass.hxx" diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 6181d5d73ec0..a205db2a28c9 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -35,8 +35,8 @@ #include <vcl/msgbox.hxx> #include <avmedia/mediawindow.hxx> #include <unotools/pathoptions.hxx> -#include <svx/opengrf.hxx> -#include <svx/impgrf.hxx> +#include <sfx2/opengrf.hxx> +#include <svtools/filter.hxx> #include <svx/gallery1.hxx> #include <svx/galtheme.hxx> #include "cuigaldlg.hxx" @@ -853,7 +853,7 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet& void TPGalleryThemeProperties::FillFilterList() { - GraphicFilter* pFilter = GetGrfFilter(); + GraphicFilter* pFilter = GraphicFilter::GetGraphicFilter(); String aExt; String aName; FilterEntry* pFilterEntry; diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 5ca76b3dafa0..2198a42c3fcf 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -50,7 +50,7 @@ #include <comphelper/processfactory.hxx> -#define HHC HangulHanjaConversion +#define HHC editeng::HangulHanjaConversion #define LINE_CNT static_cast< USHORT >(2) //............................................................................. @@ -601,7 +601,7 @@ namespace svx m_pPlayground->GetButton( SvxCommonLinguisticControl::eOptions )->Show(); // m_pPlayground->EnableButton( SvxCommonLinguisticControl::eOptions, true ); - if ( HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) + if ( editeng::HangulHanjaConversion::eHangulToHanja == _ePrimaryDirection ) { // m_aHanjaOnly.Enable( sal_False ); m_pIgnoreNonPrimary = &m_aHangulOnly; diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx new file mode 100644 index 000000000000..91136b607a22 --- /dev/null +++ b/cui/source/dialogs/hyphen.cxx @@ -0,0 +1,513 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cui.hxx" + +// include --------------------------------------------------------------- +#include <tools/shl.hxx> +#include <tools/list.hxx> +#include <com/sun/star/linguistic2/XPossibleHyphens.hpp> +#include <vcl/msgbox.hxx> +#include "cuires.hrc" +#include "hyphen.hrc" +#include <editeng/svxenum.hxx> +#include "hyphen.hxx" +#include <editeng/splwrap.hxx> +#include <svx/dlgutil.hxx> +#include <svx/dialmgr.hxx> +#include <editeng/unolingu.hxx> +#include <svtools/langtab.hxx> +#include "dialmgr.hxx" + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::linguistic2; + +#undef S2U +#undef U2S +//#define S2U(s) StringToOUString(s, CHARSET_SYSTEM) +//#define U2S(s) OUStringToString(s, CHARSET_SYSTEM) + +// define ---------------------------------------------------------------- + +#define HYPHHERE '-' +#define CONTINUE_HYPH USHRT_MAX + +// Dies ist nur ein Hack, weil an dieser Stelle das extern char aus hmwrap +// nicht bekannt ist, wird demnaechst in hmwrap durch ein define ersetzt. +#define SW_SOFT_HYPHEN '=' + +// class SvxHyphenEdit --------------------------------------------------- + +SvxHyphenEdit::SvxHyphenEdit( Window* pParent, const ResId& rResId ) : + + Edit( pParent, rResId ) +{ +} + +// ----------------------------------------------------------------------- + +void SvxHyphenEdit::KeyInput( const KeyEvent& rKEvt ) +{ +// sal_uInt16 nMod = rKEvt.GetKeyCode().GetModifier(); + sal_uInt16 nCode = rKEvt.GetKeyCode().GetCode(); + + switch ( nCode ) + { + case KEY_LEFT: + ( (SvxHyphenWordDialog*)GetParent() )->SelLeft(); + break; + + case KEY_RIGHT: + ( (SvxHyphenWordDialog*)GetParent() )->SelRight(); + break; + + case KEY_TAB: + case KEY_ESCAPE: + case KEY_RETURN: + Edit::KeyInput(rKEvt); + break; + default: + Control::KeyInput( rKEvt ); // An den Dialog weiterleiten + break; + } +} + +// class SvxHyphenWordDialog --------------------------------------------- + +SvxHyphenWordDialog::SvxHyphenWordDialog( const String &rWord, LanguageType nLang, + Window* pParent, + Reference< XHyphenator > &xHyphen, + SvxSpellWrapper* pWrapper ) : + SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_HYPHENATE ) ), + + aWordFT ( this, CUI_RES( FT_WORD ) ), + aWordEdit ( this, CUI_RES( ED_WORD ) ), + aLeftBtn ( this, CUI_RES( BTN_LEFT ) ), + aRightBtn ( this, CUI_RES( BTN_RIGHT ) ), + aOkBtn ( this, CUI_RES( BTN_HYPH_CUT ) ), + aCancelBtn ( this, CUI_RES( BTN_HYPH_CANCEL ) ), + aContBtn ( this, CUI_RES( BTN_HYPH_CONTINUE ) ), + aDelBtn ( this, CUI_RES( BTN_HYPH_DELETE ) ), + aHelpBtn ( this, CUI_RES( BTN_HYPH_HELP ) ), + aLabel ( GetText() ), + pHyphWrapper ( pWrapper ), + xHyphenator ( xHyphen ), + aActWord ( rWord ), + nActLanguage ( nLang ), + nHyphPos ( 0 ), + nOldPos ( 0 ), + bBusy ( sal_False ) +{ + aContBtn.SetClickHdl( + LINK( this, SvxHyphenWordDialog, ContinueHdl_Impl ) ); + aOkBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, CutHdl_Impl ) ); + aDelBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, DeleteHdl_Impl ) ); + aCancelBtn.SetClickHdl( + LINK( this, SvxHyphenWordDialog, CancelHdl_Impl ) ); + aLeftBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Left_Impl ) ); + aRightBtn.SetClickHdl( LINK( this, SvxHyphenWordDialog, Right_Impl ) ); + + aWordEdit.SetGetFocusHdl( + LINK( this, SvxHyphenWordDialog, GetFocusHdl_Impl ) ); + + Reference< XHyphenatedWord > xHyphWord( pWrapper ? + pWrapper->GetLast() : Reference< XInterface > () , UNO_QUERY ); + DBG_ASSERT(xHyphWord.is(), "missing hyphenated word"); + nMaxHyphenationPos = xHyphWord.is() ? xHyphWord->getHyphenationPos() : 0; + SetLabel_Impl( nLang ); + + InitControls_Impl(); + aWordEdit.GrabFocus(); + + FreeResource(); + + // disable controls if service is not available + if (!xHyphenator.is()) + Enable( sal_False ); +} + +// ----------------------------------------------------------------------- + +void SvxHyphenWordDialog::SelLeft() +{ + String aTxt( aWordEdit.GetText() ); + + for ( xub_StrLen i = nOldPos + 1; i-- > 0 ; ) + { + DBG_ASSERT(i <= aTxt.Len(), "index out of range"); + if( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) ) + { + aTxt.SetChar( i, sal_Unicode( HYPHHERE ) ); + + if ( nOldPos != 0 && nOldPos != aTxt.Len() ) + aTxt.SetChar( nOldPos, sal_Unicode( SW_SOFT_HYPHEN ) ); + nOldPos = i; + aWordEdit.SetText( aTxt ); + aWordEdit.GrabFocus(); + aWordEdit.SetSelection( Selection( i, i + 1 ) ); + break; + } + } + nHyphPos = GetHyphIndex_Impl(); + EnableLRBtn_Impl(); +} + +// ----------------------------------------------------------------------- + +void SvxHyphenWordDialog::SelRight() +{ + String aTxt( aWordEdit.GetText() ); + + for ( xub_StrLen i = nOldPos + 1; i < aTxt.Len(); ++i ) + { + if( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) ) + { + aTxt.SetChar( i, sal_Unicode( HYPHHERE ) ); + + if ( nOldPos != 0 && nOldPos != aTxt.Len() ) + aTxt.SetChar( nOldPos, sal_Unicode( SW_SOFT_HYPHEN ) ); + nOldPos = i; + aWordEdit.SetText( aTxt ); + aWordEdit.GrabFocus(); + aWordEdit.SetSelection( Selection( i, i + 1 ) ); + break; + } + } + nHyphPos = GetHyphIndex_Impl(); + EnableLRBtn_Impl(); +} + +// ----------------------------------------------------------------------- + +void SvxHyphenWordDialog::EnableLRBtn_Impl() +{ + String aTxt( aWordEdit.GetText() ); + xub_StrLen nLen = aTxt.Len(); + xub_StrLen i; + + aRightBtn.Disable(); + for ( i = nOldPos + 2; i < nLen; ++i ) + { + if ( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) ) + { + aRightBtn.Enable(); + break; + } + } + + DBG_ASSERT(nOldPos < aTxt.Len(), "nOldPos out of range"); + if (nOldPos >= aTxt.Len()) + nOldPos = aTxt.Len() - 1; + aLeftBtn.Disable(); + for ( i = nOldPos; i-- > 0; ) + { + if ( aTxt.GetChar( i ) == sal_Unicode( SW_SOFT_HYPHEN ) ) + { + aLeftBtn.Enable(); + break; + } + } +} + +// ----------------------------------------------------------------------- + + +void SvxHyphenWordDialog::SetLabel_Impl( LanguageType nLang ) +{ + String aLangStr( SvtLanguageTable::GetLanguageString( nLang ) ); + String aTmp( aLabel ); + aTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ); + aTmp.Append( aLangStr ); + aTmp.Append( sal_Unicode( ')' ) ); + SetText( aTmp ); +} + +// ----------------------------------------------------------------------- + +String SvxHyphenWordDialog::EraseUnusableHyphens_Impl( + Reference< XPossibleHyphens > &rxPossHyph, + sal_uInt16 _nMaxHyphenationPos ) +{ + // returns a String showing only those hyphen positions which will result + // in a line break if hyphenation is done there + + String aTxt; + DBG_ASSERT(rxPossHyph.is(), "missing possible hyphens"); + if (rxPossHyph.is()) + { + aTxt = String( rxPossHyph->getPossibleHyphens() ); + + Sequence< sal_Int16 > aHyphenationPositions( + rxPossHyph->getHyphenationPositions() ); + sal_Int32 nLen = aHyphenationPositions.getLength(); + const sal_Int16 *pHyphenationPos = aHyphenationPositions.getConstArray(); + + // find position nIdx after which all hyphen positions are unusable + xub_StrLen nIdx = STRING_NOTFOUND, + nPos; + if (nLen) + { + xub_StrLen nStart = 0; + for (sal_Int32 i = 0; i < nLen; ++i) + { + if (pHyphenationPos[i] > _nMaxHyphenationPos) + break; + else + { + // find corresponding hyphen pos in string + nPos = aTxt.Search( sal_Unicode( SW_SOFT_HYPHEN ), nStart ); + + if (nStart == STRING_NOTFOUND) + break; + else + { + nIdx = nPos; + nStart = nPos + 1; + } + } + } + } + DBG_ASSERT(nIdx != STRING_NOTFOUND, "no usable hyphenation position"); + + // remove not usable hyphens from string + nPos = nIdx == STRING_NOTFOUND ? 0 : nIdx + 1; + String aTmp( sal_Unicode( SW_SOFT_HYPHEN ) ), + aEmpty; + while (nPos != STRING_NOTFOUND) + nPos = aTxt.SearchAndReplace( aTmp, aEmpty, nPos + 1 ); + } + return aTxt; +} + +// ----------------------------------------------------------------------- + +void SvxHyphenWordDialog::InitControls_Impl() +{ + String aTxt; + xPossHyph = NULL; + if (xHyphenator.is()) + { + lang::Locale aLocale( SvxCreateLocale(nActLanguage) ); + xPossHyph = xHyphenator->createPossibleHyphens( aActWord, aLocale, + Sequence< PropertyValue >() ); + if (xPossHyph.is()) + { + aTxt = EraseUnusableHyphens_Impl( xPossHyph, nMaxHyphenationPos ); + } + SetLabel_Impl( nActLanguage ); + } + aWordEdit.SetText( aTxt ); + + nOldPos = aTxt.Len(); + SelLeft(); + EnableLRBtn_Impl(); +} + +// ----------------------------------------------------------------------- + +void SvxHyphenWordDialog::ContinueHyph_Impl( sal_uInt16 nInsPos ) +{ + if ( nInsPos != CONTINUE_HYPH && xPossHyph.is()) + { + if (nInsPos) + { + //String aTmp( U2S( xPossHyph->getPossibleHyphens() ) ); + String aTmp( aWordEdit.GetText() ); + DBG_ASSERT(nInsPos <= aTmp.Len() - 2, "wrong hyphen position"); + + sal_uInt16 nIdxPos = 0; + sal_uInt16 i = 0; + sal_Unicode c; + while (i < aTmp.Len() && HYPHHERE != (c = aTmp.GetChar(i++)) ) + { + if (SW_SOFT_HYPHEN == c) + nIdxPos++; + } + + Sequence< sal_Int16 > aSeq = xPossHyph->getHyphenationPositions(); + sal_Int32 nLen = aSeq.getLength(); + DBG_ASSERT(nLen, "empty sequence"); + DBG_ASSERT(nIdxPos < nLen, "index out of range"); + if (nLen && nIdxPos < nLen) + { + nInsPos = aSeq.getConstArray()[ nIdxPos ]; + pHyphWrapper->InsertHyphen( nInsPos ); + } + } + else + { + //! calling with 0 as argument will remove hyphens! + pHyphWrapper->InsertHyphen( nInsPos ); + } + } + + if ( pHyphWrapper->FindSpellError() ) + { + Reference< XHyphenatedWord > xHyphWord( pHyphWrapper->GetLast(), UNO_QUERY ); + + // adapt actual word and language to new found hyphenation result + if(xHyphWord.is()) + { + aActWord = String( xHyphWord->getWord() ); + nActLanguage = SvxLocaleToLanguage( xHyphWord->getLocale() ); + nMaxHyphenationPos = xHyphWord->getHyphenationPos(); + InitControls_Impl(); + } + } + else + EndDialog( RET_OK ); +} + +// ----------------------------------------------------------------------- + +sal_uInt16 SvxHyphenWordDialog::GetHyphIndex_Impl() +{ + sal_uInt16 nPos = 0; + String aTxt(aWordEdit.GetText()); + + for ( sal_uInt16 i=0 ; i < aTxt.Len(); ++i ) + { + sal_Unicode nChar = aTxt.GetChar( i ); + + if ( nChar == HYPHHERE ) + break; + + if ( nChar != SW_SOFT_HYPHEN ) + nPos++; + } + return nPos; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, CutHdl_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + ContinueHyph_Impl( nHyphPos ); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, CutHdl_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, DeleteHdl_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + ContinueHyph_Impl(); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, DeleteHdl_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, ContinueHdl_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + ContinueHyph_Impl( CONTINUE_HYPH ); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, ContinueHdl_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, CancelHdl_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + pHyphWrapper->SpellEnd(); + EndDialog( RET_CANCEL ); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, CancelHdl_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, Left_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + SelLeft(); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, Left_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, Right_Impl, Button *, EMPTYARG ) +{ + if( !bBusy ) + { + bBusy = sal_True; + SelRight(); + bBusy = sal_False; + } + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, Right_Impl, Button *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxHyphenWordDialog, GetFocusHdl_Impl, Edit *, EMPTYARG ) +{ + aWordEdit.SetSelection( Selection( nOldPos, nOldPos + 1 ) ); + return 0; +} +IMPL_LINK_INLINE_END( SvxHyphenWordDialog, GetFocusHdl_Impl, Edit *, EMPTYARG ) + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxHyphenWordDialog, LangError_Impl, void *, nLang ) +{ + // Status anzeigen + String aErr( SvtLanguageTable::GetLanguageString( (LanguageType)(sal_IntPtr)nLang ) ); + aErr += CUI_RESSTR( RID_SVXSTR_HMERR_CHECKINSTALL ); + InfoBox( this, aErr ).Execute(); + return 0; +} + + diff --git a/cui/source/dialogs/hyphen.hrc b/cui/source/dialogs/hyphen.hrc new file mode 100644 index 000000000000..2c6722298655 --- /dev/null +++ b/cui/source/dialogs/hyphen.hrc @@ -0,0 +1,45 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_HYPHEN_HRC +#define _SVX_HYPHEN_HRC + +// defines ------------------------------------------------------------------ + +#define ED_WORD 10 +#define BTN_LEFT 11 +#define BTN_RIGHT 12 +#define FT_WORD 13 + +#define BTN_HYPH_CONTINUE 20 +#define BTN_HYPH_DELETE 21 +#define BTN_HYPH_CUT 22 +#define BTN_HYPH_CANCEL 23 +#define BTN_HYPH_HELP 24 + + +#endif + diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src new file mode 100644 index 000000000000..71720867fcc9 --- /dev/null +++ b/cui/source/dialogs/hyphen.src @@ -0,0 +1,143 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + // include --------------------------------------------------------------- +#include "helpid.hrc" +#include "cuires.hrc" +#include "hyphen.hrc" + +String RID_SVXSTR_HMERR_CHECKINSTALL +{ + /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ + /* ### ACHTUNG: Neuer Text in Resource? ist für die Prüfung nicht verfügbar. \nÃœberprüfen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gewünschte Sprache : ist f³r die Pr³fung nicht verf³gbar. \nšberpr³fen Sie bitte Ihre Installation und installieren Sie \ngegebenenfalls die gew³nschte Sprache */ + Text [ en-US ] = "is not available for spellchecking\nPlease check your installation and install the desired language\n" ; +}; + + // RID_SVXDLG_HYPHENATE -------------------------------------------------- +ModalDialog RID_SVXDLG_HYPHENATE +{ + HelpId = HID_HYPHENATE ; + Size = MAP_APPFONT ( 188 , 100 ) ; + OutputSize = TRUE ; + SvLook = TRUE ; + Text [ en-US ] = "Hyphenation" ; + Moveable = TRUE ; + Edit ED_WORD + { + BORDER = TRUE ; + Pos = MAP_APPFONT ( 6 , 17 ) ; + Size = MAP_APPFONT ( 120 , 12 ) ; + TABSTOP = TRUE ; + LEFT = TRUE ; + }; + ImageButton BTN_LEFT + { + Pos = MAP_APPFONT ( 6 , 33 ) ; + Size = MAP_APPFONT ( 14 , 14 ) ; + TABSTOP = TRUE ; + SYMBOL = IMAGEBUTTON_ARROW_LEFT ; + }; + ImageButton BTN_RIGHT + { + Pos = MAP_APPFONT ( 22 , 33 ) ; + Size = MAP_APPFONT ( 14 , 14 ) ; + TABSTOP = TRUE ; + Symbol = IMAGEBUTTON_ARROW_RIGHT ; + }; + FixedText FT_WORD + { + Pos = MAP_APPFONT ( 6 , 6 ) ; + Size = MAP_APPFONT ( 120 , 8 ) ; + Text [ en-US ] = "~Word" ; + }; + PushButton BTN_HYPH_CONTINUE + { + Pos = MAP_APPFONT ( 132 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + Text [ en-US ] = "~Next" ; + TABSTOP = TRUE ; + }; + PushButton BTN_HYPH_DELETE + { + Pos = MAP_APPFONT ( 132 , 60 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + Text [ en-US ] = "~Remove" ; + TABSTOP = TRUE ; + }; + OKButton BTN_HYPH_CUT + { + Pos = MAP_APPFONT ( 132 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + Text [ en-US ] = "~Hyphenate" ; + TABSTOP = TRUE ; + DEFBUTTON = TRUE ; + }; + CancelButton BTN_HYPH_CANCEL + { + Pos = MAP_APPFONT ( 132 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TABSTOP = TRUE ; + }; + HelpButton BTN_HYPH_HELP + { + Pos = MAP_APPFONT ( 132 , 80 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + TABSTOP = TRUE ; + }; +}; + // ******************************************************************* EOF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 21b169ca6ab9..0193cefa2964 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -74,7 +74,7 @@ static long nTabs[] = }; -SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, SvLinkManager* pMgr, BOOL bHtml ) +SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml ) : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ), aFtFiles( this, CUI_RES( FT_FILES ) ), aFtLinks( this, CUI_RES( FT_LINKS ) ), @@ -301,7 +301,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG ) } // falls jemand der Meinung ist, seine Links auszutauschen (SD) - SvLinkManager* pNewMgr = pLinkMgr; + LinkManager* pNewMgr = pLinkMgr; pLinkMgr = 0; SetManager( pNewMgr ); @@ -388,7 +388,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton ) } if( pLinkMgr->GetPersist() ) pLinkMgr->GetPersist()->SetModified(); - SvLinkManager* pNewMgr = pLinkMgr; + LinkManager* pNewMgr = pLinkMgr; pLinkMgr = 0; SetManager( pNewMgr ); } @@ -433,7 +433,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton ) if( bNewLnkMgr ) { - SvLinkManager* pNewMgr = pLinkMgr; + LinkManager* pNewMgr = pLinkMgr; pLinkMgr = 0; SetManager( pNewMgr ); @@ -551,7 +551,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink ) } else { - SvLinkManager* pNewMgr = pLinkMgr; + LinkManager* pNewMgr = pLinkMgr; pLinkMgr = 0; SetManager( pNewMgr ); } @@ -579,7 +579,7 @@ String SvBaseLinksDlg::ImplGetStateStr( const SvBaseLink& rLnk ) return sRet; } -void SvBaseLinksDlg::SetManager( SvLinkManager* pNewMgr ) +void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr ) { if( pLinkMgr == pNewMgr ) return; diff --git a/cui/source/dialogs/makefile.mk b/cui/source/dialogs/makefile.mk index e613bd17a1e3..0c5b90aff202 100644 --- a/cui/source/dialogs/makefile.mk +++ b/cui/source/dialogs/makefile.mk @@ -50,6 +50,7 @@ SRC1FILES = \ gallery.src \ grfflt.src \ hangulhanjadlg.src \ + hyphen.src \ hlmarkwn.src \ hyperdlg.src \ iconcdlg.src \ @@ -65,6 +66,7 @@ SRC1FILES = \ srchxtra.src \ svuidlg.src \ tbxform.src \ + thesdlg.src \ zoom.src \ @@ -85,6 +87,7 @@ SLOFILES+=\ $(SLO)$/hlmailtp.obj \ $(SLO)$/hlmarkwn.obj \ $(SLO)$/hltpbase.obj \ + $(SLO)$/hyphen.obj \ $(SLO)$/iconcdlg.obj \ $(SLO)$/insdlg.obj \ $(SLO)$/insrc.obj \ @@ -102,6 +105,7 @@ SLOFILES+=\ $(SLO)$/SpellDialog.obj \ $(SLO)$/splitcelldlg.obj \ $(SLO)$/srchxtra.obj \ + $(SLO)$/thesdlg.obj \ $(SLO)$/zoom.obj \ diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index a6f027af3126..dafec167af2c 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -40,12 +40,13 @@ #include "srchxtra.hrc" #include <svx/svxitems.hrc> // RID_ATTR_BEGIN #include <svx/dialmgr.hxx> // item resources -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include "chardlg.hxx" #include "paragrph.hxx" #include <dialmgr.hxx> #include "backgrnd.hxx" #include <svx/dialogs.hrc> // RID_SVXPAGE_... +#include <tools/resary.hxx> // class SvxSearchFormatDialog ------------------------------------------- @@ -158,6 +159,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, SfxObjectShell* pSh = SfxObjectShell::Current(); DBG_ASSERT( pSh, "No DocShell" ); + ResStringArray aAttrNames( SVX_RES( RID_ATTR_NAMES ) ); SfxItemPool& rPool = pSh->GetPool(); SfxItemSet aSet( rPool, pWhRanges ); SfxWhichIter aIter( aSet ); @@ -180,18 +182,14 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent, } // item resources are in svx - USHORT nResId = nSlot - SID_SVX_START + RID_ATTR_BEGIN; + sal_uInt32 nId = aAttrNames.FindIndex( nSlot ); SvLBoxEntry* pEntry = NULL; - ResId aId( nResId, DIALOG_MGR() ); - aId.SetRT( RSC_STRING ); - if ( DIALOG_MGR().IsAvailable( aId ) ) - pEntry = aAttrLB.SvTreeListBox::InsertEntry( CUI_RESSTR( nResId ) ); + if ( RESARRAY_INDEX_NOTFOUND != nId ) + pEntry = aAttrLB.SvTreeListBox::InsertEntry( aAttrNames.GetString(nId) ); else { ByteString sError( "no resource for slot id\nslot = " ); sError += ByteString::CreateFromInt32( nSlot ); - sError += ByteString( "\nresid = " ); - sError += ByteString::CreateFromInt32( nResId ); DBG_ERRORFILE( sError.GetBuffer() ); } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx new file mode 100644 index 000000000000..c1a96541c5b7 --- /dev/null +++ b/cui/source/dialogs/thesdlg.cxx @@ -0,0 +1,492 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +// MARKER(update_precomp.py): autogen include statement, do not remove +#include "precompiled_cui.hxx" + +#include <tools/shl.hxx> +#include <svl/lngmisc.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/msgbox.hxx> +#include <vcl/svapp.hxx> +#include <com/sun/star/linguistic2/XThesaurus.hpp> +#include <com/sun/star/linguistic2/XMeaning.hpp> +#include <thesdlg.hxx> +#include <svx/dlgutil.hxx> +#include <svx/dialmgr.hxx> +#include <svx/svxerr.hxx> +#include "cuires.hrc" +#include "thesdlg.hrc" +#include <editeng/unolingu.hxx> +#include <svx/langbox.hxx> +#include <svtools/langtab.hxx> +#include "dialmgr.hxx" +#include <svx/dialogs.hrc> +#include <editeng/editerr.hxx> + +using namespace ::com::sun::star; +using namespace ::com::sun::star::lang; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::linguistic2; + +#undef S2U +#undef U2S +//#define S2U(s) StringToOUString(s, CHARSET_SYSTEM) +//#define U2S(s) OUStringToString(s, CHARSET_SYSTEM) + + +// GetReplaceEditString ------------------------------- + +static void GetReplaceEditString( String &rText ) +{ + // The strings returned by the thesaurus saometimes have some + // explanation text put in between '(' and ')' or a trailing '*'. + // These parts should not be put in the ReplaceEdit Text that may get + // inserted into the document. Thus we strip them from the text. + + xub_StrLen nPos = rText.Search( sal_Unicode('(') ); + while (STRING_NOTFOUND != nPos) + { + xub_StrLen nEnd = rText.Search( sal_Unicode(')'), nPos ); + if (STRING_NOTFOUND != nEnd) + rText.Erase( nPos, nEnd-nPos+1 ); + else + break; + nPos = rText.Search( sal_Unicode('(') ); + } + + nPos = rText.Search( sal_Unicode('*') ); + if (STRING_NOTFOUND != nPos) + rText.Erase( nPos ); + + // remove any possible remaining ' ' that may confuse the thesaurus + // when it gets called with the text + rText.EraseLeadingAndTrailingChars( sal_Unicode(' ') ); +} + +// struct ThesDlg_Impl --------------------------------------------------- + +struct ThesDlg_Impl +{ + Reference< XThesaurus > xThesaurus; + ::rtl::OUString aLookUpText; + sal_Int16 nLookUpLanguage; + + ThesDlg_Impl( Reference< XThesaurus > & xThes ); + SfxErrorContext* pErrContext; // ErrorContext, + // w"ahrend der Dialog oben ist +}; + +ThesDlg_Impl::ThesDlg_Impl(Reference< XThesaurus > & xThes) : + xThesaurus (xThes) +{ + pErrContext = NULL; + nLookUpLanguage = LANGUAGE_NONE; +} + + +// class SvxThesaurusLanguageDlg_Impl ------------------------------------ + +class SvxThesaurusLanguageDlg_Impl : public ModalDialog +{ +private: + SvxLanguageBox aLangLB; + FixedLine aLangFL; + OKButton aOKBtn; + CancelButton aCancelBtn; + HelpButton aHelpBtn; + + DECL_LINK( DoubleClickHdl_Impl, ListBox * ); + +public: + SvxThesaurusLanguageDlg_Impl( Window* pParent ); + + sal_uInt16 GetLanguage() const; + void SetLanguage( sal_uInt16 nLang ); +}; + +// ----------------------------------------------------------------------- + + +SvxThesaurusLanguageDlg_Impl::SvxThesaurusLanguageDlg_Impl( Window* pParent ) : + + ModalDialog( pParent, CUI_RES( RID_SVXDLG_THES_LANGUAGE ) ), + + aLangLB ( this, CUI_RES( LB_THES_LANGUAGE ) ), + aLangFL ( this, CUI_RES( FL_THES_LANGUAGE ) ), + aOKBtn ( this, CUI_RES( BTN_LANG_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_LANG_CANCEL ) ), + aHelpBtn ( this, CUI_RES( BTN_LANG_HELP ) ) +{ + FreeResource(); + + aLangLB.SetLanguageList( LANG_LIST_THES_USED, FALSE, FALSE ); + aLangLB.SetDoubleClickHdl( + LINK( this, SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl ) ); +} + + +// ----------------------------------------------------------------------- + +sal_uInt16 SvxThesaurusLanguageDlg_Impl::GetLanguage() const +{ + sal_uInt16 nLang = aLangLB.GetSelectLanguage(); + return nLang; +} + +// ----------------------------------------------------------------------- + +void SvxThesaurusLanguageDlg_Impl::SetLanguage( sal_uInt16 nLang ) +{ + aLangLB.SelectLanguage( nLang ); +} + +// ----------------------------------------------------------------------- + +IMPL_LINK_INLINE_START( SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl, ListBox *, EMPTYARG ) +{ + EndDialog( RET_OK ); + return 0; +} +IMPL_LINK_INLINE_END( SvxThesaurusLanguageDlg_Impl, DoubleClickHdl_Impl, ListBox *, EMPTYARG ) + +// class SvxThesaurusDialog ---------------------------------------------- + + +// ----------------------------------------------------------------------- + + +SvxThesaurusDialog::SvxThesaurusDialog( Window* pParent, Reference< XThesaurus > xThes, + const String &rWord, sal_Int16 nLanguage) : + + SvxStandardDialog( pParent, CUI_RES( RID_SVXDLG_THESAURUS ) ), + + aWordText ( this, CUI_RES( FT_WORD ) ), + aWordLB ( this, CUI_RES( LB_WORD ) ), + aReplaceText( this, CUI_RES( FT_REPL ) ), + aReplaceEdit( this, CUI_RES( ED_REPL ) ), + aMeanText ( this, CUI_RES( FT_MEAN ) ), + aMeanLB ( this, CUI_RES( LB_MEAN ) ), + aSynonymText( this, CUI_RES( FT_SYNON ) ), + aSynonymLB ( this, CUI_RES( LB_SYNON ) ), + aVarFL ( this, CUI_RES( FL_VAR ) ), + aOkBtn ( this, CUI_RES( BTN_THES_OK ) ), + aCancelBtn ( this, CUI_RES( BTN_THES_CANCEL ) ), + aLookUpBtn ( this, CUI_RES( BTN_LOOKUP ) ), + aLangBtn ( this, CUI_RES( BTN_LANGUAGE ) ), + aHelpBtn ( this, CUI_RES( BTN_THES_HELP ) ), + aErrStr ( CUI_RES( STR_ERR_WORDNOTFOUND ) ) +{ + pImpl = new ThesDlg_Impl( xThes ); + pImpl->aLookUpText = ::rtl::OUString( rWord ); + pImpl->nLookUpLanguage = nLanguage; + pImpl->pErrContext = + new SfxErrorContext( ERRCTX_SVX_LINGU_THESAURUS, String(), this, + RID_SVXERRCTX, &DIALOG_MGR() ); + + aLangBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LanguageHdl_Impl ) ); + aLookUpBtn.SetClickHdl( LINK( this, SvxThesaurusDialog, LookUpHdl_Impl ) ); + aMeanLB.SetSelectHdl( LINK( this, SvxThesaurusDialog, EntryHdl_Impl ) ); + aSynonymLB.SetSelectHdl( LINK( this, SvxThesaurusDialog, SynonymHdl_Impl ) ); + Link aLink = LINK( this, SvxThesaurusDialog, SelectHdl_Impl ); + aMeanLB.SetDoubleClickHdl( aLink ); + aSynonymLB.SetDoubleClickHdl( aLink ); + aWordLB.SetSelectHdl( aLink ); + + FreeResource(); + + ::rtl::OUString aTmp( rWord ); + linguistic::RemoveHyphens( aTmp ); + linguistic::ReplaceControlChars( aTmp ); + aReplaceEdit.SetText( aTmp ); + aWordLB.InsertEntry( aTmp ); + aWordLB.SelectEntry( aTmp ); + + Init_Impl( nLanguage ); + + // disable controls if service is missing + if (!pImpl->xThesaurus.is()) + Enable( sal_False ); +} + + +// ----------------------------------------------------------------------- + +SvxThesaurusDialog::~SvxThesaurusDialog() +{ + delete pImpl->pErrContext; + delete pImpl; +} + +// ----------------------------------------------------------------------- + +uno::Sequence< Reference< XMeaning > > SAL_CALL + SvxThesaurusDialog::queryMeanings_Impl( + ::rtl::OUString& rTerm, + const Locale& rLocale, + const beans::PropertyValues& rProperties ) + throw(lang::IllegalArgumentException, uno::RuntimeException) +{ + uno::Sequence< Reference< XMeaning > > aMeanings( + pImpl->xThesaurus->queryMeanings( rTerm, rLocale, rProperties ) ); + + // text with '.' at the end? + if (0 == aMeanings.getLength() && rTerm.getLength() && + rTerm.getStr()[ rTerm.getLength() - 1 ] == '.') + { + // try again without trailing '.' chars. It may be a word at the + // end of a sentence and not an abbreviation... + String aTxt( rTerm ); + aTxt.EraseTrailingChars( '.' ); + aMeanings = pImpl->xThesaurus->queryMeanings( aTxt, rLocale, rProperties ); + if (aMeanings.getLength()) + { + rTerm = aTxt; + } + } + + return aMeanings; +} + +// ----------------------------------------------------------------------- + +sal_uInt16 SvxThesaurusDialog::GetLanguage() const +{ + return pImpl->nLookUpLanguage; +} + +// ----------------------------------------------------------------------- + +void SvxThesaurusDialog::UpdateMeaningBox_Impl( uno::Sequence< Reference< XMeaning > > *pMeaningSeq ) +{ + // create temporary meaning list if not supplied from somewhere else + sal_Bool bTmpSeq = sal_False; + if (!pMeaningSeq && pImpl->xThesaurus.is()) + { + bTmpSeq = sal_True; + lang::Locale aLocale( SvxCreateLocale( pImpl->nLookUpLanguage ) ); + uno::Sequence< Reference< XMeaning > > aTmpMean = queryMeanings_Impl( + pImpl->aLookUpText, aLocale, Sequence< PropertyValue >() ); + + pMeaningSeq = new Sequence< Reference< XMeaning > > ( aTmpMean ); + + // set new replace edit text if a different look up text was used + // see: queryMeanings_Impl + aReplaceEdit.SetText( pImpl->aLookUpText ); + } + + sal_Int32 nMeaningCount = pMeaningSeq ? pMeaningSeq->getLength() : 0; + const Reference< XMeaning > *pMeaning = pMeaningSeq ? pMeaningSeq->getConstArray() : NULL; + aMeanLB.Clear(); + for ( sal_Int32 i = 0; i < nMeaningCount; ++i ) + aMeanLB.InsertEntry( pMeaning[i]->getMeaning() ); + + // remove temporary meaning list + if (bTmpSeq) + delete pMeaningSeq; + + if (aMeanLB.GetEntryCount() > 0) + aMeanLB.SelectEntryPos(0); + UpdateSynonymBox_Impl(); +} + + +// ----------------------------------------------------------------------- +void SvxThesaurusDialog::UpdateSynonymBox_Impl() +{ + + aSynonymLB.Clear(); + + sal_uInt16 nPos = aMeanLB.GetSelectEntryPos(); // active meaning pos + if (nPos != LISTBOX_ENTRY_NOTFOUND && pImpl->xThesaurus.is()) + { + // get Reference< XMeaning > for selected meaning + lang::Locale aLocale( SvxCreateLocale( pImpl->nLookUpLanguage ) ); + Reference< XMeaning > xMeaning = queryMeanings_Impl( + pImpl->aLookUpText, aLocale, Sequence< PropertyValue >() ) + .getConstArray()[ nPos ]; + + uno::Sequence< ::rtl::OUString > aSynonyms; + if (xMeaning.is()) + aSynonyms = xMeaning->querySynonyms(); + + sal_Int32 nSynonymCount = aSynonyms.getLength(); + const ::rtl::OUString *pSynonym = aSynonyms.getConstArray(); + for ( sal_Int32 i=0; i < nSynonymCount; ++i ) + aSynonymLB.InsertEntry( pSynonym[i] ); + } + +} + +// ----------------------------------------------------------------------- + +void SvxThesaurusDialog::Apply() +{ +} + +// ----------------------------------------------------------------------- +void SvxThesaurusDialog::Init_Impl(sal_Int16 nLanguage) +{ + // Sprache anpassen + String aStr( GetText() ); + aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 ); + aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) ); + //aStr += GetLanguageString( (LanguageType)pImpl->pThesaurus->GetLanguage() ); + aStr += SvtLanguageTable::GetLanguageString( (LanguageType) nLanguage ); + aStr.Append( sal_Unicode( ')' ) ); + SetText( aStr ); // Text der Window-Leiste setzen (Wort + Sprache) + + // adapt meanings according to (new) language + UpdateMeaningBox_Impl(); +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, LookUpHdl_Impl, Button *, pBtn ) +{ + + EnterWait(); + + String aText( aReplaceEdit.GetText() ); + + ::rtl::OUString aOldLookUpText = pImpl->aLookUpText; + pImpl->aLookUpText = ::rtl::OUString( aText ); + + uno::Sequence< Reference< XMeaning > > aMeanings; + if (pImpl->xThesaurus.is()) + aMeanings = queryMeanings_Impl( + pImpl->aLookUpText, + SvxCreateLocale( pImpl->nLookUpLanguage ), + Sequence< PropertyValue >() ); + + LeaveWait(); + if ( aMeanings.getLength() == 0 ) + { + if( pBtn == &aCancelBtn ) // called via double click + { + pImpl->aLookUpText = aOldLookUpText; + } + else + { + UpdateMeaningBox_Impl( &aMeanings ); + if( pBtn == &aLookUpBtn ) + InfoBox( this, aErrStr ).Execute(); + } + return 0; + } + + UpdateMeaningBox_Impl( &aMeanings ); + + if ( aWordLB.GetEntryPos( aText ) == LISTBOX_ENTRY_NOTFOUND ) + aWordLB.InsertEntry( aText ); + + aWordLB.SelectEntry( aText ); + aMeanLB.SelectEntryPos( 0 ); + + String aStr( aMeanLB.GetSelectEntry() ); + GetReplaceEditString( aStr ); + aReplaceEdit.SetText( aStr ); + aSynonymLB.SetNoSelection(); + + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, LanguageHdl_Impl, Button *, EMPTYARG ) +{ + if (!pImpl->xThesaurus.is()) + return 0; + + SvxThesaurusLanguageDlg_Impl aDlg( this ); + sal_uInt16 nLang = pImpl->nLookUpLanguage; + aDlg.SetLanguage( nLang ); + + if ( aDlg.Execute() == RET_OK ) + { + nLang = aDlg.GetLanguage(); + if (pImpl->xThesaurus->hasLocale( SvxCreateLocale( nLang ) )) + pImpl->nLookUpLanguage = nLang; + UpdateMeaningBox_Impl(); + Init_Impl( nLang ); + } + + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, SynonymHdl_Impl, ListBox *, EMPTYARG ) +{ + if ( aSynonymLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND ) + { + String aStr( aSynonymLB.GetSelectEntry() ); + GetReplaceEditString( aStr ); + aReplaceEdit.SetText( aStr ); + } + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, SelectHdl_Impl, ListBox *, pBox ) +{ + String aStr( pBox->GetSelectEntry() ); + GetReplaceEditString( aStr ); + aReplaceEdit.SetText( aStr ); + + //! 'aCancelBtn' is used to indicate that the handler is called as result + //! of a double click action. + LookUpHdl_Impl( &aCancelBtn /* ??? &aLookUpBtn */ ); + + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, EntryHdl_Impl, ListBox *, EMPTYARG ) +{ + + UpdateSynonymBox_Impl(); + + return 0; +} + +// ----------------------------------------------------------------------- + +IMPL_LINK( SvxThesaurusDialog, SpellErrorHdl_Impl, void *, pError ) +{ + // Der "ubergebene Pointer pError ist die falsche Sprachen-Nummer + LanguageType eLang = (LanguageType)(sal_uIntPtr)pError; + String aErr( SvtLanguageTable::GetLanguageString( eLang ) ); + // Fehlermeldung ausgeben + ErrorHandler::HandleError( + *new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr ) ); + return 0; +} + diff --git a/cui/source/dialogs/thesdlg.hrc b/cui/source/dialogs/thesdlg.hrc new file mode 100644 index 000000000000..9621422a1894 --- /dev/null +++ b/cui/source/dialogs/thesdlg.hrc @@ -0,0 +1,59 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_THESDLG_HRC +#define _SVX_THESDLG_HRC + +// defines --------------------------------------------------------------- + +#define BTN_THES_OK 10 +#define BTN_THES_CANCEL 11 +#define BTN_LANGUAGE 12 +#define BTN_THES_HELP 13 +#define BTN_LOOKUP 14 +#define FT_WORD 15 +#define LB_WORD 16 +#define FT_MEAN 17 +#define LB_MEAN 18 +#define FT_SYNON 19 +#define LB_SYNON 20 +#define FT_REPL 21 +#define ED_REPL 22 +#define FL_VAR 23 + +#define STR_ERR_WORDNOTFOUND 30 + +// LanguageDialog -------------------------------------------------------- + +#define LB_THES_LANGUAGE 10 +#define FL_THES_LANGUAGE 11 +#define BTN_LANG_OK 12 +#define BTN_LANG_CANCEL 12 +#define BTN_LANG_HELP 13 + + +#endif + diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src new file mode 100644 index 000000000000..c7caa659b1c0 --- /dev/null +++ b/cui/source/dialogs/thesdlg.src @@ -0,0 +1,208 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + // include --------------------------------------------------------------- +#include "cuires.hrc" +#include "thesdlg.hrc" +#include "helpid.hrc" +#include <svx/svxids.hrc> // SID_THESAURUS + +// pragma ---------------------------------------------------------------- + + // RID_SVXDLG_THES ------------------------------------------------------- +ModalDialog RID_SVXDLG_THESAURUS +{ + HelpId = SID_THESAURUS ; + OutputSize = TRUE ; + Size = MAP_APPFONT ( 285 , 116 ) ; + Text [ en-US ] = "Thesaurus" ; + Moveable = TRUE ; + SvLook = TRUE ; + OkButton BTN_THES_OK + { + Pos = MAP_APPFONT ( 219 , 6 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BTN_THES_CANCEL + { + Pos = MAP_APPFONT ( 219 , 23 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; + }; + PushButton BTN_LOOKUP + { + Pos = MAP_APPFONT ( 219 , 40 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; + Text [ en-US ] = "~Search" ; + }; + PushButton BTN_LANGUAGE + { + Pos = MAP_APPFONT ( 219 , 57 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; + Text [ en-US ] = "~Language..." ; + }; + HelpButton BTN_THES_HELP + { + Pos = MAP_APPFONT ( 219 , 77 ) ; + Size = MAP_APPFONT ( 60 , 14 ) ; + }; + FixedText FT_WORD + { + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; + Text [ en-US ] = "~Word" ; + LEFT = TRUE ; + }; + ListBox LB_WORD + { + DropDown = TRUE ; + Pos = MAP_APPFONT ( 12 , 25 ) ; + Size = MAP_APPFONT ( 96 , 65 ) ; + }; + FixedText FT_MEAN + { + Pos = MAP_APPFONT ( 12 , 43 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; + Text [ en-US ] = "~Meaning " ; + LEFT = TRUE ; + }; + ListBox LB_MEAN + { + BORDER = TRUE ; + Pos = MAP_APPFONT ( 12 , 55 ) ; + Size = MAP_APPFONT ( 96 , 50 ) ; + AutoHScroll = TRUE ; + }; + FixedText FT_SYNON + { + Pos = MAP_APPFONT ( 111 , 43 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; + Text [ en-US ] = "Sy~nonym" ; + LEFT = TRUE ; + }; + ListBox LB_SYNON + { + BORDER = TRUE ; + Pos = MAP_APPFONT ( 111 , 55 ) ; + Size = MAP_APPFONT ( 96 , 50 ) ; + AutoHScroll = TRUE ; + }; + FixedText FT_REPL + { + Pos = MAP_APPFONT ( 111 , 14 ) ; + Size = MAP_APPFONT ( 96 , 8 ) ; + Text [ en-US ] = "~Replace" ; + LEFT = TRUE ; + }; + Edit ED_REPL + { + BORDER = TRUE ; + Pos = MAP_APPFONT ( 111 , 25 ) ; + Size = MAP_APPFONT ( 96 , 12 ) ; + LEFT = TRUE ; + }; + FixedLine FL_VAR + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 207 , 8 ) ; + Text [ en-US ] = "Variations" ; + }; + String STR_ERR_WORDNOTFOUND + { + Text [ en-US ] = "Word not found in thesaurus" ; + }; +}; + // RID_SVXDLG_THES_LANGUAGE ---------------------------------------------- +ModalDialog RID_SVXDLG_THES_LANGUAGE +{ + HelpId = HID_THES_LANGUAGE ; + OutputSize = TRUE ; + SVLook = TRUE ; + Size = MAP_APPFONT ( 170 , 86 ) ; + /* ### ACHTUNG: Neuer Text in Resource? Sprache auswählen : Sprache auswõhlen */ + /* ### ACHTUNG: Neuer Text in Resource? Sprache auswählen : Sprache auswõhlen */ + Text [ en-US ] = "Select Language" ; + Moveable = TRUE ; + ListBox LB_THES_LANGUAGE + { + Border = TRUE ; + Pos = MAP_APPFONT ( 12 , 14 ) ; + Size = MAP_APPFONT ( 90 , 60 ) ; + Sort = TRUE ; + }; + FixedLine FL_THES_LANGUAGE + { + Pos = MAP_APPFONT ( 6 , 3 ) ; + Size = MAP_APPFONT ( 102 , 8 ) ; + Text [ en-US ] = "Selection" ; + }; + OKButton BTN_LANG_OK + { + Pos = MAP_APPFONT ( 114 , 6 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + DefButton = TRUE ; + }; + CancelButton BTN_LANG_CANCEL + { + Pos = MAP_APPFONT ( 114 , 23 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; + HelpButton BTN_LANG_HELP + { + Pos = MAP_APPFONT ( 114 , 43 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; + }; +}; + // ********************************************************************** EOF + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cui/source/dialogs/winpluginlib.cpp b/cui/source/dialogs/winpluginlib.cpp index 2696a95cacea..d1bdf9eb2002 100644 --- a/cui/source/dialogs/winpluginlib.cpp +++ b/cui/source/dialogs/winpluginlib.cpp @@ -25,10 +25,6 @@ * ************************************************************************/ -#ifdef SVX_DLLIMPLEMENTATION -#undef SVX_DLLIMPLEMENTATION -#endif - #if defined _MSC_VER #pragma warning(push, 1) #endif diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index db4e1b6537cb..8929e9ebdef5 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -100,6 +100,8 @@ #include "macroass.hxx" #include "acccfg.hxx" #include "insrc.hxx" +#include "hyphen.hxx" +#include "thesdlg.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::frame; @@ -116,6 +118,8 @@ IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl); IMPL_ABSTDLG_BASE(AbstractSvxDistributeDialog_Impl); IMPL_ABSTDLG_BASE(AbstractHangulHanjaConversionDialog_Impl); IMPL_ABSTDLG_BASE(AbstractFmShowColsDialog_Impl); +IMPL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl) +IMPL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl) AbstractSvxZoomDialog_Impl::~AbstractSvxZoomDialog_Impl() \ { @@ -267,12 +271,12 @@ void AbstractHangulHanjaConversionDialog_Impl::SetByCharacter( sal_Bool _bByChar pDlg->SetByCharacter(_bByCharacter); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ) { pDlg->SetConversionDirectionState(_bTryBothDirections, _ePrimaryConversionDirection); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ) { pDlg->SetConversionFormat(_eType); } @@ -321,7 +325,7 @@ sal_Bool AbstractHangulHanjaConversionDialog_Impl::GetUseBothDirections( ) const return pDlg->GetUseBothDirections(); } -HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversionDialog_Impl::GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const +editeng::HangulHanjaConversion::ConversionDirection AbstractHangulHanjaConversionDialog_Impl::GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const { return pDlg->GetDirection( _eDefaultDirection ); } @@ -338,7 +342,7 @@ String AbstractHangulHanjaConversionDialog_Impl::GetCurrentString( ) const { return pDlg->GetCurrentString(); } -HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const +editeng::HangulHanjaConversion::ConversionFormat AbstractHangulHanjaConversionDialog_Impl::GetConversionFormat( ) const { return pDlg->GetConversionFormat(); } @@ -353,6 +357,36 @@ String AbstractHangulHanjaConversionDialog_Impl::GetCurrentSuggestion( ) const return pDlg->GetCurrentSuggestion(); } +String AbstractThesaurusDialog_Impl::GetWord() +{ + return pDlg->GetWord(); +}; + +sal_uInt16 AbstractThesaurusDialog_Impl::GetLanguage() const +{ + return pDlg->GetLanguage(); +}; + +Window* AbstractThesaurusDialog_Impl::GetWindow() +{ + return pDlg; +} + +void AbstractHyphenWordDialog_Impl::SelLeft() +{ + pDlg->SelLeft(); +} + +void AbstractHyphenWordDialog_Impl::SelRight() +{ + pDlg->SelRight(); +} + +Window* AbstractHyphenWordDialog_Impl::GetWindow() +{ + return pDlg; +} + Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_Impl::GetObject() { return pDlg->GetObject(); @@ -1098,12 +1132,29 @@ AbstractSvxDistributeDialog* AbstractDialogFactory_Impl::CreateSvxDistributeD } AbstractHangulHanjaConversionDialog* AbstractDialogFactory_Impl::CreateHangulHanjaConversionDialog(Window* pParent, - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) { HangulHanjaConversionDialog* pDlg = new HangulHanjaConversionDialog( pParent, _ePrimaryDirection); return new AbstractHangulHanjaConversionDialog_Impl( pDlg ); } +AbstractThesaurusDialog* AbstractDialogFactory_Impl::CreateThesaurusDialog( Window* pParent, + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + const String &rWord, sal_Int16 nLanguage ) +{ + SvxThesaurusDialog* pDlg = new SvxThesaurusDialog( pParent, xThesaurus, rWord, nLanguage ); + return new AbstractThesaurusDialog_Impl( pDlg ); +} + +AbstractHyphenWordDialog* AbstractDialogFactory_Impl::CreateHyphenWordDialog( Window* pParent, + const String &rWord, LanguageType nLang, + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + SvxSpellWrapper* pWrapper ) +{ + SvxHyphenWordDialog* pDlg = new SvxHyphenWordDialog( rWord, nLang, pParent, xHyphen, pWrapper ); + return new AbstractHyphenWordDialog_Impl( pDlg ); +} + AbstractFmShowColsDialog * AbstractDialogFactory_Impl::CreateFmShowColsDialog( Window* pParent ) { FmShowColsDialog* pDlg = new FmShowColsDialog( pParent); @@ -1868,7 +1919,7 @@ SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* p return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) ); } -SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p) +SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p) { SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML ); if ( p ) @@ -1901,4 +1952,3 @@ SvxAbstractInsRowColDlg* AbstractDialogFactory_Impl::CreateSvxInsRowColDlg( Wind { return new SvxInsRowColDlg( pParent, bCol, nHelpId ); } - diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index f609d3f81c27..844439efbf61 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -63,6 +63,8 @@ class SvPasteObjectDialog; class SvBaseLinksDlg; class SvxTransformTabDialog; class SvxCaptionTabDialog; +class SvxThesaurusDialog; +class SvxHyphenWordDialog; namespace svx{ class HangulHanjaConversionDialog; @@ -158,8 +160,8 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void EndDialog(long nResult = 0); virtual void EnableRubySupport( sal_Bool _bVal ); virtual void SetByCharacter( sal_Bool _bByCharacter ) ; - virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); - virtual void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ); + virtual void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + virtual void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); virtual void SetOptionsChangedHdl( const Link& _rHdl ); virtual void SetIgnoreHdl( const Link& _rHdl ); virtual void SetIgnoreAllHdl( const Link& _rHdl ) ; @@ -169,19 +171,34 @@ class AbstractHangulHanjaConversionDialog_Impl: public AbstractHangulHanjaConver virtual void SetConversionFormatChangedHdl( const Link& _rHdl ) ; virtual void SetFindHdl( const Link& _rHdl ); virtual sal_Bool GetUseBothDirections( ) const; - virtual HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; + virtual editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection _eDefaultDirection ) const; virtual void SetCurrentString( const String& _rNewString, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rSuggestions, bool _bOriginatesFromDocument = true ); virtual String GetCurrentString( ) const ; - virtual HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const ; + virtual editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const ; virtual void FocusSuggestion( ); virtual String GetCurrentSuggestion( ) const; }; -// for HangulHanjaConversionDialog end +class AbstractThesaurusDialog_Impl : public AbstractThesaurusDialog +{ + DECL_ABSTDLG_BASE(AbstractThesaurusDialog_Impl,SvxThesaurusDialog) + virtual String GetWord(); + virtual sal_uInt16 GetLanguage() const; + virtual Window* GetWindow(); +}; + + +class AbstractHyphenWordDialog_Impl: public AbstractHyphenWordDialog +{ + DECL_ABSTDLG_BASE(AbstractHyphenWordDialog_Impl,SvxHyphenWordDialog) + virtual void SelLeft(); + virtual void SelRight(); + virtual Window* GetWindow(); +}; // for FmShowColsDialog begin class FmShowColsDialog; @@ -576,7 +593,6 @@ private: //AbstractDialogFactory_Impl implementations class AbstractDialogFactory_Impl : public SvxAbstractDialogFactory { - public: virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ); virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ); @@ -626,10 +642,17 @@ public: virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj ); virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent ); - virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::SvLinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); + virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 ); virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + virtual AbstractThesaurusDialog* CreateThesaurusDialog( Window*, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + const String &rWord, sal_Int16 nLanguage ); + + virtual AbstractHyphenWordDialog* CreateHyphenWordDialog( Window*, + const String &rWord, LanguageType nLang, + ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + SvxSpellWrapper* pWrapper ); virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ); //add for FmShowColsDialog virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index b6fda36db083..a2deb5192389 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -42,13 +42,13 @@ #include <com/sun/star/uno/Reference.hxx> -#include <svx/svxbox.hxx> +#include <svtools/svxbox.hxx> #include <svx/langbox.hxx> #include <memory> #include <svtools/svmedit.hxx> #include <svl/lstner.hxx> #include <svtools/xtextedt.hxx> -#include <svx/SpellPortions.hxx> +#include <editeng/SpellPortions.hxx> class ScrollBar; class TextEngine; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 74df5d6bd3ba..c2ba66766292 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -113,8 +113,8 @@ private: String sBoldUnderline; String sURL; String sNoDblSpaces; - String sHalf; String sDash; + String sNonBrkSpace; String sFirst; public: @@ -148,15 +148,14 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage String sUseReplaceTbl; String sCptlSttWord; String sCptlSttSent; - String sTypo; String sUserStyle; String sBullet; String sByInputBullet; String sBoldUnder; String sNoDblSpaces; - String sFraction; String sDetectURL; String sDash; + String sNonBrkSpace; String sOrdinal; String sRightMargin; String sNum; @@ -331,6 +330,18 @@ class OfaQuoteTabPage : public SfxTabPage using TabPage::ActivatePage; private: + // For anything but writer + SvxCheckListBox aCheckLB; + + // Just for writer + OfaACorrCheckListBox aSwCheckLB; + String sHeader1; + String sHeader2; + + String sNonBrkSpace; + String sOrdinal; + + SvLBoxButtonData* pCheckButtonData; FixedLine aSingleFL; CheckBox aSingleTypoCB; @@ -369,6 +380,8 @@ private: String ChangeStringExt_Impl( sal_UCS4 ); + SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); + OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ); public: ~OfaQuoteTabPage(); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 232abed9efc9..56aedff40de1 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -39,7 +39,7 @@ #include <vcl/combobox.hxx> #include <svl/slstitm.hxx> #include <svtools/transfer.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <sfx2/tabdlg.hxx> #include <svx/galctrl.hxx> #include <svx/galmisc.hxx> diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 604ac1d80fde..e7f9047af5ca 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -37,7 +37,7 @@ #include <vcl/dialog.hxx> #include <vcl/group.hxx> #include <vcl/salbtype.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svx/graphctl.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index 36f497d03514..e7cc7e1ca2f4 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -215,6 +215,10 @@ #define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) #define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) +#define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) +#define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) +#define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38) +#define RID_SVXSTR_HMERR_CHECKINSTALL (RID_SVX_START + 94) // hyperlink dialog #define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx index 13896f68cd1c..be4c4bc0cd7a 100644 --- a/cui/source/inc/cuisrchdlg.hxx +++ b/cui/source/inc/cuisrchdlg.hxx @@ -31,34 +31,20 @@ #include <svtools/stdctrl.hxx> -#ifndef _COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> -#endif -#ifndef _EDIT_HXX //autogen #include <vcl/edit.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> -#endif -#ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> -#endif -#ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> -#endif #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <svl/svarray.hxx> #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> #include <svtools/svmedit.hxx> -#include <sfx2/srchdefs.hxx> +#include <svl/srchdefs.hxx> class SvxJSearchOptionsPage; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index bc360331522d..287fa206f148 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -34,9 +34,9 @@ #include <vcl/fixed.hxx> #include <vcl/scrbar.hxx> #include <svx/checklbx.hxx> -#include <svx/hangulhanja.hxx> +#include <editeng/hangulhanja.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/linguistic2/XConversionDictionaryList.hpp> #include <svtools/valueset.hxx> @@ -143,7 +143,7 @@ namespace svx public: HangulHanjaConversionDialog( Window* _pParent, - HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); + editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection ); ~HangulHanjaConversionDialog( ); public: @@ -170,20 +170,20 @@ namespace svx // retrieves the current suggestion String GetCurrentSuggestion( ) const; - void SetConversionFormat( HangulHanjaConversion::ConversionFormat _eType ); - HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; + void SetConversionFormat( editeng::HangulHanjaConversion::ConversionFormat _eType ); + editeng::HangulHanjaConversion::ConversionFormat GetConversionFormat( ) const; void SetByCharacter( sal_Bool _bByCharacter ); sal_Bool GetByCharacter( ) const; - void SetConversionDirectionState( sal_Bool _bTryBothDirections, HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); + void SetConversionDirectionState( sal_Bool _bTryBothDirections, editeng::HangulHanjaConversion::ConversionDirection _ePrimaryConversionDirection ); // should text which does not match the primary conversion direction be ignored? sal_Bool GetUseBothDirections( ) const; // get current conversion direction to use // (return argument if GetUseBothDirections is true) - HangulHanjaConversion::ConversionDirection GetDirection( HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; + editeng::HangulHanjaConversion::ConversionDirection GetDirection( editeng::HangulHanjaConversion::ConversionDirection eDefaultDirection ) const; // enables or disbales the checkboxes for ruby formatted replacements void EnableRubySupport( sal_Bool bVal ); diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 1ef7bd60e9bb..1d98daa179e1 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -344,7 +344,7 @@ #define HID_PAGE_TEXTATTR (HID_CUI_START + 308) #define HID_TEXTATTR_CTL_POSITION (HID_CUI_START + 309) #define HID_TRANS_POSITION_SIZE (HID_CUI_START + 310) -// free +#define HID_HYPHENATE (HID_CUI_START + 311) #define HID_SVXPAGE_CHAR_NAME (HID_CUI_START + 312) #define HID_SVXPAGE_CHAR_EFFECTS (HID_CUI_START + 313) #define HID_SVXPAGE_CHAR_POSITION (HID_CUI_START + 314) @@ -370,6 +370,9 @@ #define HID_MACRO_HEADERTABLISTBOX (HID_CUI_START + 335) #define HID_GALLERY_ENTER_TITLE (HID_CUI_START + 336) #define HID_GALLERY_TITLE_EDIT (HID_CUI_START + 337) +#define HID_THES_LANGUAGE (HID_CUI_START + 338) +#define HID_OFAPAGE_QUOTE_SW_CLB (HID_CUI_START + 339) +#define HID_OFAPAGE_QUOTE_CLB (HID_CUI_START + 340) // please adjust ACT_SVX_HID_END2 below if you add entries here! @@ -377,7 +380,7 @@ // Overrun check --------------------------------------------------------- // ----------------------------------------------------------------------- -#define ACT_CUI_HID_END HID_CUI_START + 337 +#define ACT_CUI_HID_END HID_CUI_START + 340 #if ACT_CUI_HID_END > HID_CUI_END #error Resource-Ueberlauf in #line, #file diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx new file mode 100644 index 000000000000..42ec38e31331 --- /dev/null +++ b/cui/source/inc/hyphen.hxx @@ -0,0 +1,119 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_HYPHEN_HXX +#define _SVX_HYPHEN_HXX + +// include --------------------------------------------------------------- + +#include <vcl/edit.hxx> +#include <vcl/button.hxx> +#include <vcl/fixed.hxx> +#include <sfx2/basedlgs.hxx> +#include <com/sun/star/uno/Reference.hxx> + +// forward --------------------------------------------------------------- + +namespace com{namespace sun{namespace star{ +namespace linguistic2{ + class XHyphenator; + class XPossibleHyphens; +}}}} + +class SvxSpellWrapper; + +// class SvxHyphenEdit --------------------------------------------------- + +class SvxHyphenEdit : public Edit +{ +public: + SvxHyphenEdit( Window* pParent, const ResId& rResId ); + +protected: + virtual void KeyInput( const KeyEvent &rKEvt ); +}; + +// class SvxHyphenWordDialog --------------------------------------------- + +class SvxHyphenWordDialog : public SfxModalDialog +{ +public: + SvxHyphenWordDialog( const String &rWord, LanguageType nLang, + Window* pParent, + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenator > &xHyphen, + SvxSpellWrapper* pWrapper ); + + void SelLeft(); + void SelRight(); + +private: + FixedText aWordFT; + SvxHyphenEdit aWordEdit; + ImageButton aLeftBtn; + ImageButton aRightBtn; + OKButton aOkBtn; + CancelButton aCancelBtn; + PushButton aContBtn; + PushButton aDelBtn; + HelpButton aHelpBtn; + String aLabel; + SvxSpellWrapper* pHyphWrapper; + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XHyphenator > xHyphenator; + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XPossibleHyphens > xPossHyph; + String aActWord; // actual (to be displayed) word + LanguageType nActLanguage; // and language + sal_uInt16 nMaxHyphenationPos; // right most valid hyphenation pos + sal_uInt16 nHyphPos; + sal_uInt16 nOldPos; + sal_Bool bBusy; + + void EnableLRBtn_Impl(); + void SetLabel_Impl( LanguageType nLang ); + String EraseUnusableHyphens_Impl( + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XPossibleHyphens > &rxPossHyph, + sal_uInt16 nMaxHyphenationPos ); + + void InitControls_Impl(); + void ContinueHyph_Impl( sal_uInt16 nInsPos = 0 ); + sal_uInt16 GetHyphIndex_Impl(); + + DECL_LINK( CutHdl_Impl, Button* ); + DECL_LINK( DeleteHdl_Impl, Button* ); + DECL_LINK( ContinueHdl_Impl, Button* ); + DECL_LINK( CancelHdl_Impl, Button* ); + DECL_LINK( Left_Impl, Button* ); + DECL_LINK( Right_Impl, Button* ); + DECL_LINK( GetFocusHdl_Impl, Edit* ); + DECL_LINK( LangError_Impl, void* ); +}; + + +#endif + diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 255abfc1b2bd..f6f75ddee89d 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -45,7 +45,7 @@ *************************************************************************/ namespace sfx2 { - class SvLinkManager; + class LinkManager; class SvBaseLink; } @@ -80,7 +80,7 @@ class SvBaseLinksDlg : public ModalDialog String aStrCloselinkmsg; String aStrCloselinkmsgMulti; String aStrWaitinglink; - sfx2::SvLinkManager* pLinkMgr; + sfx2::LinkManager* pLinkMgr; BOOL bHtmlMode; SvTabListBox aTbLinks; Timer aUpdateTimer; @@ -123,10 +123,10 @@ class SvBaseLinksDlg : public ModalDialog String& Closelinkmsg() { return aStrCloselinkmsg; } String& CloselinkmsgMulti() { return aStrCloselinkmsgMulti; } String& Waitinglink() { return aStrWaitinglink; } - void SetManager( sfx2::SvLinkManager* ); + void SetManager( sfx2::LinkManager* ); public: - SvBaseLinksDlg( Window * pParent, sfx2::SvLinkManager*, BOOL bHtml = FALSE ); + SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, BOOL bHtml = FALSE ); ~SvBaseLinksDlg(); void SetActLink( sfx2::SvBaseLink * pLink ); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6876c3ef7a3a..47decd0ad9c7 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -37,7 +37,7 @@ #include <vcl/edit.hxx> #include <vcl/field.hxx> #ifndef _SVX_NUMDEF_HXX -#include <svx/numdef.hxx> +#include <editeng/numdef.hxx> #endif #include <svtools/ctrlbox.hxx> #include <svl/svarray.hxx> diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx index 0390fa4ec39a..e7259f2a682c 100644 --- a/cui/source/inc/optimprove.hxx +++ b/cui/source/inc/optimprove.hxx @@ -29,8 +29,6 @@ // include --------------------------------------------------------------- -#include "svx/svxdllapi.h" - #include <vcl/tabpage.hxx> #include <vcl/fixed.hxx> #include <vcl/button.hxx> diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index b5c59781a987..9220ed9bcfbc 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -40,7 +40,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include "svx/svxdllapi.h" namespace com{namespace sun{namespace star{ namespace beans{ @@ -107,7 +106,7 @@ public: // class SvxLinguTabPage ------------------------------------------------- -class SVX_DLLPUBLIC SvxLinguTabPage : public SfxTabPage +class SvxLinguTabPage : public SfxTabPage { private: FixedLine aLinguisticFL; @@ -149,11 +148,11 @@ private: SvxLinguData_Impl* pLinguData; - SVX_DLLPRIVATE SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SVX_DLLPRIVATE SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); + SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); + SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); - SVX_DLLPRIVATE void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); - SVX_DLLPRIVATE ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); + void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); + ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); #ifdef _SVX_OPTLINGU_CXX DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); @@ -163,8 +162,8 @@ private: DECL_LINK( PostDblClickHdl_Impl, SvTreeListBox * ); DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); - SVX_DLLPRIVATE void UpdateModulesBox_Impl(); - SVX_DLLPRIVATE void UpdateDicBox_Impl(); + void UpdateModulesBox_Impl(); + void UpdateDicBox_Impl(); #endif public: diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 222cb6ddcc1e..5aee41b17996 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -88,7 +88,7 @@ private: DECL_LINK( PathHdl_Impl, PushButton * ); DECL_LINK( StandardHdl_Impl, PushButton * ); - DECL_LINK( PathSelect_Impl, OptHeaderTabListBox * ); + DECL_LINK( PathSelect_Impl, svx::OptHeaderTabListBox * ); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); DECL_LINK( HeaderEndDrag_Impl, HeaderBar * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 02019219ba83..9931d2d2cff1 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -36,7 +36,7 @@ #include <svtools/stdctrl.hxx> #include <svx/pagectrl.hxx> #include <svx/frmdirlbox.hxx> -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <i18npool/paper.hxx> #include <svx/flagsdef.hxx> diff --git a/cui/source/inc/radiobtnbox.hxx b/cui/source/inc/radiobtnbox.hxx index 2d3d35090195..0aadf6817d18 100644 --- a/cui/source/inc/radiobtnbox.hxx +++ b/cui/source/inc/radiobtnbox.hxx @@ -30,13 +30,12 @@ // include --------------------------------------------------------------- #include <svx/simptabl.hxx> -#include "svx/svxdllapi.h" namespace svx { // class SvxRadioButtonListBox ------------------------------------------- -class SVX_DLLPUBLIC SvxRadioButtonListBox : public SvxSimpleTable +class SvxRadioButtonListBox : public SvxSimpleTable { using SvxSimpleTable::SetTabs; diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index a45848d48921..80e22eff43b5 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -35,7 +35,7 @@ #include <vcl/fixed.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/tstpitem.hxx> +#include <editeng/tstpitem.hxx> #include <svx/flagsdef.hxx> // forward --------------------------------------------------------------- diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx new file mode 100644 index 000000000000..d46c2ce5affa --- /dev/null +++ b/cui/source/inc/thesdlg.hxx @@ -0,0 +1,121 @@ +/************************************************************************* + * + * 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 + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_THESDLG_HXX +#define _SVX_THESDLG_HXX + +// include --------------------------------------------------------------- + +#include <vcl/edit.hxx> +#include <vcl/button.hxx> +#include <vcl/lstbox.hxx> +#include <vcl/fixed.hxx> +#include <svx/stddlg.hxx> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/beans/PropertyValues.hpp> + +// forward --------------------------------------------------------------- + +struct ThesDlg_Impl; + +class SvxThesaurusLanguageDlg_Impl; + +namespace com { namespace sun { namespace star { + namespace linguistic2 { + class XThesaurus; + class XMeaning; + } + namespace lang { + struct Locale; + } +}}} + +// class SvxThesaurusDialog ---------------------------------------------- + +class SvxThesaurusDialog : public SvxStandardDialog +{ +public: + friend class SvxThesaurusLanguageDlg_Impl; + + SvxThesaurusDialog( Window* pParent, + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XThesaurus > xThesaurus, + const String &rWord, sal_Int16 nLanguage ); + ~SvxThesaurusDialog(); + + String GetWord() { return aReplaceEdit.GetText(); } + + sal_uInt16 GetLanguage() const; + +private: + FixedText aWordText; + ListBox aWordLB; + FixedText aReplaceText; + Edit aReplaceEdit; + FixedText aMeanText; + ListBox aMeanLB; + FixedText aSynonymText; + ListBox aSynonymLB; + FixedLine aVarFL; + + OKButton aOkBtn; + CancelButton aCancelBtn; + PushButton aLookUpBtn; + PushButton aLangBtn; + HelpButton aHelpBtn; + + String aErrStr; + + ThesDlg_Impl* pImpl; // always != NULL + + virtual void Apply(); + + void UpdateSynonymBox_Impl(); + void UpdateMeaningBox_Impl( + ::com::sun::star::uno::Sequence< + ::com::sun::star::uno::Reference< + ::com::sun::star::linguistic2::XMeaning > > *pMeaningSeq = NULL ); + void Init_Impl(sal_Int16 nLanguage); + + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XMeaning > > + SAL_CALL queryMeanings_Impl( + ::rtl::OUString& rTerm, + const ::com::sun::star::lang::Locale& rLocale, + const ::com::sun::star::beans::PropertyValues& rProperties ) + throw(::com::sun::star::lang::IllegalArgumentException, + ::com::sun::star::uno::RuntimeException); + // Handler + DECL_LINK( SelectHdl_Impl, ListBox * ); + DECL_LINK( SynonymHdl_Impl, ListBox * ); + DECL_LINK( LookUpHdl_Impl, Button * ); + DECL_LINK( LanguageHdl_Impl, Button * ); + DECL_LINK( EntryHdl_Impl, ListBox * ); + DECL_LINK( SpellErrorHdl_Impl, void * ); +}; + +#endif + diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 31abff2802a4..76bbafa54faa 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -28,18 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -#ifdef SVX_DLLIMPLEMENTATION -#undef SVX_DLLIMPLEMENTATION -#endif #include "connpooloptions.hxx" -#ifndef _OFFAPP_CONNPOOLOPTIONS_HRC_ #include "connpooloptions.hrc" -#endif #include <svtools/editbrowsebox.hxx> #include <vcl/field.hxx> #include "connpoolsettings.hxx" #include <svl/eitem.hxx> - #include <cuires.hrc> #include "helpid.hrc" #include <dialmgr.hxx> diff --git a/cui/source/options/connpoolsettings.cxx b/cui/source/options/connpoolsettings.cxx index b8952ca40d20..f17b805000f9 100644 --- a/cui/source/options/connpoolsettings.cxx +++ b/cui/source/options/connpoolsettings.cxx @@ -28,9 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" -#ifdef SVX_DLLIMPLEMENTATION -#undef SVX_DLLIMPLEMENTATION -#endif #include "connpoolsettings.hxx" //........................................................................ diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx index a5cc834c235f..7d488c263bad 100644 --- a/cui/source/options/cuisrchdlg.cxx +++ b/cui/source/options/cuisrchdlg.cxx @@ -51,12 +51,12 @@ #define ITEMID_SETITEM 0 -#include <sfx2/srchitem.hxx> +#include <svl/srchitem.hxx> #include <svx/pageitem.hxx> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <optjsearch.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include "backgrnd.hxx" diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 033d1e0cce0e..f6fa4e45ca95 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -29,14 +29,14 @@ #include "precompiled_cui.hxx" #include <optasian.hxx> -#include <svx/langitem.hxx> -#include <svx/unolingu.hxx> +#include <editeng/langitem.hxx> +#include <editeng/unolingu.hxx> #include <optasian.hrc> #include <dialmgr.hxx> #include <cuires.hrc> #include <tools/table.hxx> #include <tools/shl.hxx> -#include <svx/asiancfg.hxx> +#include <svl/asiancfg.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/i18n/XForbiddenCharacters.hpp> diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index f05c3facd5b9..1c76da9212c1 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dlgutil.hxx> #include <sfx2/sfxuno.hxx> #include <svl/eitem.hxx> diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 5ebf9b25de3d..b9a181a28438 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_cui.hxx" #include <svl/zforlist.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svl/flagitem.hxx> #include <sfx2/dispatch.hxx> #include <unotools/lingucfg.hxx> @@ -66,12 +66,13 @@ #include <svx/dlgutil.hxx> #include "cuitabarea.hxx" #include <cuires.hrc> -#include <svx/unolingu.hxx> -#include <svx/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/langitem.hxx> #include <comphelper/processfactory.hxx> #include <rtl/ustrbuf.hxx> - - +#include <editeng/editids.hrc> +#include <svx/svxids.hrc> +#include <svl/intitem.hxx> #include <dialmgr.hxx> #include <svtools/helpopt.hxx> #include <unotools/saveopt.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 861c938bfabe..f44660c85874 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -33,6 +33,7 @@ #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <unotools/saveopt.hxx> +#include <svl/intitem.hxx> #define _SVX_OPTGENRL_CXX diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index 9e958697bb68..28cd43fab8d6 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -31,8 +31,7 @@ // include --------------------------------------------------------------- #include <svtools/langtab.hxx> - -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include "opthtml.hxx" #include "opthtml.hrc" #include <cuires.hrc> diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 538611777b58..588549787d99 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -35,7 +35,7 @@ #include <svtools/stdctrl.hxx> #include <svtools/svtabbx.hxx> #include <sfx2/tabdlg.hxx> -#include <svx/srchcfg.hxx> +#include <svl/srchcfg.hxx> #ifdef _SVX_OPTINET2_CXX #include <svtools/headbar.hxx> diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 51dca1aefb35..f5bfd351ae45 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -37,7 +37,7 @@ #include <tools/dynary.hxx> #include <i18npool/mslangid.hxx> #include <unotools/lingucfg.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/dlgutil.hxx> #include <linguistic/lngprops.hxx> #include <linguistic/misc.hxx> @@ -70,7 +70,7 @@ #include "optlingu.hrc" #include <svx/svxdlg.hxx> -#include <svx/optitems.hxx> +#include <editeng/optitems.hxx> #include "optlingu.hxx" #include <dialmgr.hxx> #include <cuires.hrc> diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx index 719bbb6f6fd1..42eed3b3daba 100644 --- a/cui/source/options/optmemory.cxx +++ b/cui/source/options/optmemory.cxx @@ -29,7 +29,7 @@ #include "precompiled_cui.hxx" #include <svtools/langtab.hxx> #include <svl/zforlist.hxx> -#include <goodies/grfmgr.hxx> +#include <svtools/grfmgr.hxx> #include <svl/flagitem.hxx> #include <sfx2/dispatch.hxx> #include <unotools/lingucfg.hxx> @@ -52,8 +52,8 @@ #include <unotools/configitem.hxx> #include <sfx2/objsh.hxx> #include <comphelper/types.hxx> -#include <svx/unolingu.hxx> -#include <svx/langitem.hxx> +#include <editeng/unolingu.hxx> +#include <editeng/langitem.hxx> #include "cuioptgenrl.hxx" #include "optpath.hxx" #include "optsave.hxx" diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 8f2ca98f1c6f..63cd5f1a8ea9 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -253,7 +253,7 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : Size aHeadSize = pHeaderBar->GetSizePixel(); WinBits nBits = WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP; - pPathBox = new OptHeaderTabListBox( &aPathCtrl, nBits ); + pPathBox = new svx::OptHeaderTabListBox( &aPathCtrl, nBits ); aPathCtrl.SetFocusControl( pPathBox ); pPathBox->SetWindowBits( nBits ); pPathBox->SetDoubleClickHdl( aLink ); @@ -406,7 +406,7 @@ void SvxPathTabPage::FillUserData() // ----------------------------------------------------------------------- -IMPL_LINK( SvxPathTabPage, PathSelect_Impl, OptHeaderTabListBox *, EMPTYARG ) +IMPL_LINK( SvxPathTabPage, PathSelect_Impl, svx::OptHeaderTabListBox *, EMPTYARG ) /* [Beschreibung] diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index 8052ffc12049..f1651b0bd1dd 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -110,7 +110,7 @@ #include "treeopt.hxx" #include "treeopt.hrc" #include "fontsubs.hxx" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <svx/xtable.hxx> #include "connpoolconfig.hxx" #include "dbregister.hxx" @@ -120,11 +120,11 @@ #ifndef _SVX_LANGITEM_HXX #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #endif -#include <svx/optitems.hxx> +#include <editeng/optitems.hxx> #include <svx/drawitem.hxx> #include <rtl/uri.hxx> diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index cce0b3a3e3b5..cba8cd1e411b 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -305,39 +305,6 @@ String RID_RIDER_SLL_PERSONAL Text [ en-US ] = "Personal certificates" ; }; -// RID_OFADLG_OPTIONS_TREE_WARNING --------------------------------------- - -ModalDialog RID_OFADLG_OPTIONS_TREE_HINT -{ - OutputSize = TRUE; - Size = MAP_APPFONT( 240, 105 ); - Moveable = TRUE; - Closeable = TRUE; - FixedImage IMG_HINT - { - Pos = MAP_APPFONT( 6, 6 ); - Size = MAP_APPFONT( 30, 30 ); - }; - FixedText FT_HINT - { - Pos = MAP_APPFONT( 39, 6 ); - Size = MAP_APPFONT( 195, 60 ); - WordBreak = TRUE; - Text [ en-US ] = "Please note: the settings displayed refer to the internal browser of %PRODUCTNAME (%PRODUCTNAME Writer/Web). In \"Tools - Options - Browser - External Browser\" the use of a different browser has been activated. In order to be able to use the same settings in other browsers you need to define these in the external browser settings."; - }; - CheckBox CB_DISABLE - { - Pos = MAP_APPFONT( 39, 69 ); - Size = MAP_APPFONT( 195, 12 ); - Text [ en-US ] = "~Do not show information again"; - }; - OKButton BTN_HINT - { - Pos = MAP_APPFONT( 95, 85 ); - Size = MAP_APPFONT( 50, 14 ); - }; -}; - // ******************************************************************* EOF diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index f401ff5dc2bd..65d0cad3dfd1 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -32,14 +32,14 @@ #include "align.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include <svx/dialogs.hrc> #include <cuires.hrc> #include "align.hrc" #include <svx/rotmodit.hxx> #include <svx/algitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/frmdiritem.hxx> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> #include <tools/shl.hxx> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b30e871ae7f6..0ee3c38c1e1d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -58,10 +58,10 @@ #include "autocdlg.hxx" #include "autocdlg.hrc" #include "helpid.hrc" -#include <svx/acorrcfg.hxx> -#include <svx/svxacorr.hxx> +#include <editeng/acorrcfg.hxx> +#include <editeng/svxacorr.hxx> #include "cuicharmap.hxx" -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <dialmgr.hxx> #include <svx/svxids.hrc> // SID_OPEN_SMARTTAGSOPTIONS @@ -224,9 +224,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, sBoldUnderline (CUI_RES(ST_BOLD_UNDER )), sURL (CUI_RES(ST_DETECT_URL )), sNoDblSpaces (CUI_RES(STR_NO_DBL_SPACES )), - sHalf (CUI_RES(ST_FRACTION )), - sDash (CUI_RES(ST_DASH )), - sFirst (CUI_RES(ST_ORDINAL )) + sDash (CUI_RES(ST_DASH )) { FreeResource(); @@ -268,10 +266,8 @@ BOOL OfaAutocorrOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(CptlSttSntnc, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol, aCheckLB.IsChecked(nPos++)); pAutoCorrect->SetAutoCorrFlag(ChgToEnEmDash, aCheckLB.IsChecked(nPos++)); - pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(nPos++)); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); if(bReturn ) @@ -309,8 +305,6 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.InsertEntry(sStartCap); aCheckLB.InsertEntry(sBoldUnderline); aCheckLB.InsertEntry(sURL); - aCheckLB.InsertEntry(sFirst); - aCheckLB.InsertEntry(sHalf); aCheckLB.InsertEntry(sDash); aCheckLB.InsertEntry(sNoDblSpaces); @@ -320,10 +314,8 @@ void OfaAutocorrOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & CptlSttSntnc) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgWeightUnderl) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & SetINetAttr) ); - aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); - aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgFractionSymbol) ); aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgToEnEmDash) ); - aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IngnoreDoubleSpace) ); + aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & IgnoreDoubleSpace) ); aCheckLB.SetUpdateMode(TRUE); } @@ -450,8 +442,6 @@ enum OfaAutoFmtOptions BEGIN_UPPER, BOLD_UNDERLINE, DETECT_URL, - REPLACE_1ST, - REPLACE_HALF, REPLACE_DASHES, DEL_SPACES_AT_STT_END, DEL_SPACES_BETWEEN_LINES, @@ -463,7 +453,6 @@ enum OfaAutoFmtOptions DEL_EMPTY_NODE, REPLACE_USER_COLL, REPLACE_BULLETS, - REPLACE_QUOTATION, MERGE_SINGLE_LINE_PARA }; @@ -480,15 +469,12 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, sUseReplaceTbl (CUI_RES( ST_USE_REPLACE )), sCptlSttWord (CUI_RES( ST_CPTL_STT_WORD)), sCptlSttSent (CUI_RES( ST_CPTL_STT_SENT)), - sTypo (CUI_RES( ST_TYPO )), sUserStyle (CUI_RES( ST_USER_STYLE )), sBullet (CUI_RES( ST_BULLET )), sBoldUnder (CUI_RES( ST_BOLD_UNDER )), sNoDblSpaces (CUI_RES( STR_NO_DBL_SPACES)), - sFraction (CUI_RES( ST_FRACTION )), sDetectURL (CUI_RES( ST_DETECT_URL )), sDash (CUI_RES( ST_DASH )), - sOrdinal (CUI_RES( ST_ORDINAL )), sRightMargin (CUI_RES( ST_RIGHT_MARGIN )), sNum (CUI_RES( STR_NUM )), sBorder (CUI_RES( STR_BORDER )), @@ -505,11 +491,6 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - const LocaleDataWrapper& rLcl = aSysLcl.GetLocaleData(); - sTypo.SearchAndReplace( String::CreateFromAscii("%1"), - rLcl.getDoubleQuotationMarkStart()); - sTypo.SearchAndReplace( String::CreateFromAscii("%2"), - rLcl.getDoubleQuotationMarkEnd()); aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); @@ -622,7 +603,7 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(ChgWeightUnderl, aCheckLB.IsChecked(BOLD_UNDERLINE, CBCOL_SECOND)); - pAutoCorrect->SetAutoCorrFlag(IngnoreDoubleSpace, + pAutoCorrect->SetAutoCorrFlag(IgnoreDoubleSpace, aCheckLB.IsChecked(IGNORE_DBLSPACE, CBCOL_SECOND)); bCheck = aCheckLB.IsChecked(DETECT_URL, CBCOL_FIRST); @@ -631,20 +612,10 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetAutoCorrFlag(SetINetAttr, aCheckLB.IsChecked(DETECT_URL, CBCOL_SECOND)); - bCheck = aCheckLB.IsChecked(REPLACE_1ST, CBCOL_FIRST); - bModified |= pOpt->bChgOrdinalNumber != bCheck; - pOpt->bChgOrdinalNumber = bCheck; - pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, - aCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND)); - bCheck = aCheckLB.IsChecked(DEL_EMPTY_NODE, CBCOL_FIRST); bModified |= pOpt->bDelEmptyNode != bCheck; pOpt->bDelEmptyNode = bCheck; - bCheck = aCheckLB.IsChecked(REPLACE_QUOTATION, CBCOL_FIRST); - bModified |= pOpt->bReplaceQuote != bCheck; - pOpt->bReplaceQuote = bCheck; - bCheck = aCheckLB.IsChecked(REPLACE_USER_COLL, CBCOL_FIRST); bModified |= pOpt->bChgUserColl != bCheck; pOpt->bChgUserColl = bCheck; @@ -684,12 +655,6 @@ BOOL OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet& ) bModified |= pOpt->bReplaceStyles != bCheck; pOpt->bReplaceStyles = bCheck; - bCheck = aCheckLB.IsChecked(REPLACE_HALF, CBCOL_FIRST); - bModified |= pOpt->bChgFracionSymbol != bCheck; - pOpt->bChgFracionSymbol = bCheck; - pAutoCorrect->SetAutoCorrFlag(ChgFractionSymbol, - aCheckLB.IsChecked(REPLACE_HALF, CBCOL_SECOND)); - bCheck = aCheckLB.IsChecked(REPLACE_DASHES, CBCOL_FIRST); bModified |= pOpt->bChgToEnEmDash != bCheck; pOpt->bChgToEnEmDash = bCheck; @@ -749,8 +714,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.GetModel()->Insert(CreateEntry(sCptlSttSent, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sBoldUnder, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDetectURL, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sOrdinal, CBCOL_BOTH )); - aCheckLB.GetModel()->Insert(CreateEntry(sFraction, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDash, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceAtSttEnd, CBCOL_BOTH )); aCheckLB.GetModel()->Insert(CreateEntry(sDelSpaceBetweenLines, CBCOL_BOTH )); @@ -763,7 +726,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.GetModel()->Insert(CreateEntry(sDeleteEmptyPara, CBCOL_FIRST )); aCheckLB.GetModel()->Insert(CreateEntry(sUserStyle, CBCOL_FIRST )); aCheckLB.GetModel()->Insert(CreateEntry(sBullet, CBCOL_FIRST )); - aCheckLB.GetModel()->Insert(CreateEntry(sTypo, CBCOL_FIRST )); aCheckLB.GetModel()->Insert(CreateEntry(sRightMargin, CBCOL_FIRST )); aCheckLB.CheckEntryPos( USE_REPLACE_TABLE, CBCOL_FIRST, pOpt->bAutoCorrect ); @@ -774,13 +736,9 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( BEGIN_UPPER, CBCOL_SECOND, 0 != (nFlags & CptlSttSntnc) ); aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_FIRST, pOpt->bChgWeightUnderl ); aCheckLB.CheckEntryPos( BOLD_UNDERLINE, CBCOL_SECOND, 0 != (nFlags & ChgWeightUnderl) ); - aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IngnoreDoubleSpace) ); + aCheckLB.CheckEntryPos( IGNORE_DBLSPACE, CBCOL_SECOND, 0 != (nFlags & IgnoreDoubleSpace) ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_FIRST, pOpt->bSetINetAttr ); aCheckLB.CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) ); - aCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); - aCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); - aCheckLB.CheckEntryPos( REPLACE_HALF, CBCOL_FIRST, pOpt->bChgFracionSymbol ); - aCheckLB.CheckEntryPos( REPLACE_HALF, CBCOL_SECOND, 0 != (nFlags & ChgFractionSymbol) ); aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash ); aCheckLB.CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) ); aCheckLB.CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd ); @@ -788,7 +746,6 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet& ) aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines ); aCheckLB.CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines ); aCheckLB.CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode ); - aCheckLB.CheckEntryPos( REPLACE_QUOTATION, CBCOL_FIRST, pOpt->bReplaceQuote ); aCheckLB.CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl ); aCheckLB.CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum ); @@ -2032,8 +1989,50 @@ void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) --------------------------------------------------*/ +enum OfaQuoteOptions +{ + ADD_NONBRK_SPACE, + REPLACE_1ST +}; + +SvLBoxEntry* OfaQuoteTabPage::CreateEntry(String& rTxt, USHORT nCol) +{ + SvLBoxEntry* pEntry = new SvLBoxEntry; + + if ( !pCheckButtonData ) + { + pCheckButtonData = new SvLBoxButtonData( &aSwCheckLB ); + aSwCheckLB.SetCheckButtonData( pCheckButtonData ); + } + + pEntry->AddItem( new SvLBoxContextBmp( pEntry, 0, Image(), Image(), 0)); // Sonst Puff! + + String sEmpty; + if (nCol == CBCOL_SECOND) + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + else + pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); + + if (nCol == CBCOL_FIRST) + pEntry->AddItem( new SvLBoxString( pEntry, 0, sEmpty) ); // Leerspalte + else + pEntry->AddItem( new SvLBoxButton( pEntry, SvLBoxButtonKind_enabledCheckbox, 0, pCheckButtonData ) ); + + pEntry->AddItem( new OfaImpBrwString( pEntry, 0, rTxt ) ); + + return pEntry; +} + OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent, CUI_RES( RID_OFAPAGE_AUTOCORR_QUOTE ), rSet), + aCheckLB (this, CUI_RES(CLB_SETTINGS )), + aSwCheckLB (this, CUI_RES(CLB_SETTINGS )), + sHeader1 (CUI_RES( STR_HEADER1 )), + sHeader2 (CUI_RES( STR_HEADER2 )), + sNonBrkSpace (CUI_RES( ST_NON_BREAK_SPACE )), + sOrdinal (CUI_RES( ST_ORDINAL )), + pCheckButtonData ( NULL ), + aSingleFL (this, CUI_RES(FL_SINGLE )), aSingleTypoCB (this, CUI_RES(CB_SGL_TYPO )), aSglStartQuoteFT (this, CUI_RES(FT_SGL_STARTQUOTE )), @@ -2061,6 +2060,38 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : { FreeResource(); + BOOL bShowSWOptions = FALSE; + + aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); + aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB ); + + SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE ); + if ( pItem && pItem->GetValue() ) + bShowSWOptions = TRUE; + + if ( bShowSWOptions ) + { + static long aStaticTabs[]= + { + 3, 0, 20, 40 + }; + + aSwCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); + + aSwCheckLB.SvxSimpleTable::SetTabs(aStaticTabs); + String sHeader( sHeader1 ); + sHeader += '\t'; + sHeader += sHeader2; + sHeader += '\t'; + aSwCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, + HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED); + aCheckLB.Hide( TRUE ); + } + else + { + aSwCheckLB.HideTable( ); + } + aStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); aEndQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); aSglStartQuotePB.SetClickHdl(LINK(this, OfaQuoteTabPage, QuoteHdl)); @@ -2074,6 +2105,7 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : --------------------------------------------------*/ OfaQuoteTabPage::~OfaQuoteTabPage() { + delete( pCheckButtonData ); } /*-----------------03.07.97 13:17------------------- @@ -2091,6 +2123,32 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); long nFlags = pAutoCorrect->GetFlags(); + + if ( aCheckLB.IsVisible( ) ) + { + USHORT nPos = 0; + pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, aCheckLB.IsChecked(nPos++)); + pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, aCheckLB.IsChecked(nPos++)); + } + + BOOL bModified = FALSE; + if ( aSwCheckLB.IsVisible( ) ) + { + SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); + + BOOL bCheck = aSwCheckLB.IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST); + bModified |= pOpt->bAddNonBrkSpace != bCheck; + pOpt->bAddNonBrkSpace = bCheck; + pAutoCorrect->SetAutoCorrFlag(AddNonBrkSpace, + aSwCheckLB.IsChecked(ADD_NONBRK_SPACE, CBCOL_SECOND)); + + bCheck = aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_FIRST); + bModified |= pOpt->bChgOrdinalNumber != bCheck; + pOpt->bChgOrdinalNumber = bCheck; + pAutoCorrect->SetAutoCorrFlag(ChgOrdinalNumber, + aSwCheckLB.IsChecked(REPLACE_1ST, CBCOL_SECOND)); + } + pAutoCorrect->SetAutoCorrFlag(ChgQuotes, aTypoCB.IsChecked()); pAutoCorrect->SetAutoCorrFlag(ChgSglQuotes, aSingleTypoCB.IsChecked()); BOOL bReturn = nFlags != pAutoCorrect->GetFlags(); @@ -2119,7 +2177,7 @@ BOOL OfaQuoteTabPage::FillItemSet( SfxItemSet& ) pAutoCorrect->SetEndSingleQuote(cUCS2); } - if(bReturn ) + if( bModified || bReturn ) { SvxAutoCorrCfg* pCfg = SvxAutoCorrCfg::Get(); pCfg->SetModified(); @@ -2142,6 +2200,42 @@ void OfaQuoteTabPage::Reset( const SfxItemSet& ) SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get()->GetAutoCorrect(); const long nFlags = pAutoCorrect->GetFlags(); + // Initialize the Sw options + if ( aSwCheckLB.IsVisible( ) ) + { + SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags(); + + aSwCheckLB.SetUpdateMode( FALSE ); + aSwCheckLB.Clear(); + + aSwCheckLB.GetModel()->Insert(CreateEntry(sNonBrkSpace, CBCOL_BOTH )); + aSwCheckLB.GetModel()->Insert(CreateEntry(sOrdinal, CBCOL_BOTH )); + + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_FIRST, pOpt->bAddNonBrkSpace ); + aSwCheckLB.CheckEntryPos( ADD_NONBRK_SPACE, CBCOL_SECOND, 0 != (nFlags & AddNonBrkSpace) ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_FIRST, pOpt->bChgOrdinalNumber ); + aSwCheckLB.CheckEntryPos( REPLACE_1ST, CBCOL_SECOND, 0 != (nFlags & ChgOrdinalNumber) ); + + aSwCheckLB.SetUpdateMode( TRUE ); + } + + // Initialize the non Sw options + if ( aCheckLB.IsVisible( ) ) + { + aCheckLB.SetUpdateMode( FALSE ); + aCheckLB.Clear( ); + + aCheckLB.InsertEntry( sNonBrkSpace ); + aCheckLB.InsertEntry( sOrdinal ); + + USHORT nPos = 0; + aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & AddNonBrkSpace) ); + aCheckLB.CheckEntryPos( nPos++, 0 != (nFlags & ChgOrdinalNumber) ); + + aCheckLB.SetUpdateMode( TRUE ); + } + + // Initialize the quote stuffs aTypoCB .Check(0 != (nFlags & ChgQuotes)); aSingleTypoCB .Check(0 != (nFlags & ChgSglQuotes)); aTypoCB .SaveValue(); diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc index 6332d854ca99..1e77c22b4fa9 100644 --- a/cui/source/tabpages/autocdlg.hrc +++ b/cui/source/tabpages/autocdlg.hrc @@ -145,7 +145,7 @@ #define STR_NO_DBL_SPACES 204 #define ST_DETECT_URL 205 #define ST_ORDINAL 206 -#define ST_FRACTION 207 +#define ST_NON_BREAK_SPACE 207 #define ST_DASH 208 #define FT_LANG 209 #define LB_LANG 210 diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 67b4e6185392..9db3dbeb43b4 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -70,7 +70,7 @@ TabDialog RID_OFA_AUTOCORR_DLG PageItem { Identifier = RID_OFAPAGE_AUTOCORR_QUOTE ; - Text [ en-US ] = "Custom Quotes" ; + Text [ en-US ] = "Localized Options" ; }; PageItem { @@ -126,14 +126,6 @@ TabDialog RID_OFA_AUTOCORR_DLG { \ Text [ en-US ] = "URL Recognition" ; \ }; \ - String ST_ORDINAL \ - { \ - Text [ en-US ] = "Replace 1st... with 1^st..." ; \ - }; \ - String ST_FRACTION \ - { \ - Text [ en-US ] = "Replace 1/2 ... with ½ ..." ; \ - }; \ String ST_DASH \ { \ Text [ en-US ] = "Replace dashes" ; \ @@ -212,10 +204,6 @@ TabPage RID_OFAPAGE_AUTOFMT_APPLY /* ### ACHTUNG: Neuer Text in Resource? Leere Absätze entfernen : Leere Absõtze entfernen */ Text [ en-US ] = "Remove blank paragraphs" ; }; - String ST_TYPO - { - Text [ en-US ] = "Replace \"standard\" quotes with %1custom%2 quotes" ; - }; String ST_USER_STYLE { Text [ en-US ] = "Replace Custom Styles" ; @@ -491,114 +479,137 @@ TabPage RID_OFAPAGE_AUTOCORR_QUOTE Size = MAP_APPFONT ( 260 , 185 ) ; SVLook = TRUE ; Hide = TRUE ; - Text [ en-US ] = "Custom Quotes" ; - FixedLine FL_SINGLE + Text [ en-US ] = "Localized Options" ; + Control CLB_SETTINGS { Pos = MAP_APPFONT ( 4 , 3 ) ; - Size = MAP_APPFONT ( 252 , 8 ) ; + Size = MAP_APPFONT ( 252 , 85 ) ; + Border = TRUE ; + TabStop = TRUE ; + }; + String STR_HEADER1 + { + Text [ en-US ] = "[M]" ; + }; + String STR_HEADER2 + { + Text [ en-US ] = "[T]" ; + }; + String ST_NON_BREAK_SPACE + { + Text [ en-US ] = "Add non breaking space before specific punctuation marks in french text" ; + }; + String ST_ORDINAL + { + Text [ en-US ] = "Format ordinal numbers suffixes (1st -> 1^st)" ; + }; + FixedLine FL_SINGLE + { + Pos = MAP_APPFONT ( 4 , 90 ) ; + Size = MAP_APPFONT ( 122 , 8 ) ; Text [ en-US ] = "Single quotes" ; }; Checkbox CB_SGL_TYPO { - Pos = MAP_APPFONT ( 7 , 14 ) ; + Pos = MAP_APPFONT ( 7 , 101 ) ; Size = MAP_APPFONT ( 86 , 10 ) ; Text [ en-US ] = "Repla~ce" ; }; FixedText FT_SGL_STARTQUOTE { - Pos = MAP_APPFONT ( 7 , 30 ) ; + Pos = MAP_APPFONT ( 7 , 114 ) ; Size = MAP_APPFONT ( 86 , 8 ) ; Text [ en-US ] = "~Start quote:" ; }; PushButton PB_SGL_STARTQUOTE { - Pos = MAP_APPFONT ( 105 , 28 ) ; + Pos = MAP_APPFONT ( 10 , 125 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\'" ; TabStop = TRUE ; }; FixedText FT_SGSTEX { - Pos = MAP_APPFONT ( 124 , 30 ) ; + Pos = MAP_APPFONT ( 26 , 127 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; }; FixedText FT_SGL_ENDQUOTE { - Pos = MAP_APPFONT ( 7 , 46 ) ; + Pos = MAP_APPFONT ( 7 , 139 ) ; Size = MAP_APPFONT ( 86 , 8 ) ; Text [ en-US ] = "~End quote:" ; }; PushButton PB_SGL_ENDQUOTE { - Pos = MAP_APPFONT ( 105 , 44 ) ; + Pos = MAP_APPFONT ( 10 , 151 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\'" ; TabStop = TRUE ; }; FixedText FT_SGENEX { - Pos = MAP_APPFONT ( 124 , 46 ) ; + Pos = MAP_APPFONT ( 26 , 153 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; }; PushButton PB_SGL_STD { - Pos = MAP_APPFONT ( 198 , 63 ) ; + Pos = MAP_APPFONT ( 7 , 167 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "~Default" ; }; FixedLine FL_DOUBLE { - Pos = MAP_APPFONT ( 4 , 83 ) ; - Size = MAP_APPFONT ( 252 , 8 ) ; + Pos = MAP_APPFONT ( 134 , 90 ) ; + Size = MAP_APPFONT ( 122 , 8 ) ; Text [ en-US ] = "Double quotes" ; }; CheckBox CB_TYPO { - Pos = MAP_APPFONT ( 7 , 94 ) ; + Pos = MAP_APPFONT ( 137 , 101 ) ; Size = MAP_APPFONT ( 86 , 10 ) ; TabStop = TRUE ; Text [ en-US ] = "Repl~ace" ; }; FixedText FT_STARTQUOTE { - Pos = MAP_APPFONT ( 7 , 110 ) ; + Pos = MAP_APPFONT ( 137 , 114 ) ; Size = MAP_APPFONT ( 86 , 8 ) ; Text [ en-US ] = "Start q~uote:" ; }; PushButton PB_STARTQUOTE { - Pos = MAP_APPFONT ( 105 , 108 ) ; + Pos = MAP_APPFONT ( 140 , 125 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\"" ; TabStop = TRUE ; }; FixedText FT_DBSTEX { - Pos = MAP_APPFONT ( 124 , 110 ) ; + Pos = MAP_APPFONT ( 156 , 127 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; }; FixedText FT_ENDQUOTE { - Pos = MAP_APPFONT ( 7 , 126 ) ; + Pos = MAP_APPFONT ( 137 , 139 ) ; Size = MAP_APPFONT ( 86 , 10 ) ; Text [ en-US ] = "E~nd quote:" ; }; PushButton PB_ENDQUOTE { - Pos = MAP_APPFONT ( 105 , 124 ) ; + Pos = MAP_APPFONT ( 140 , 151 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "\"" ; TabStop = TRUE ; }; FixedText FT_DBECEX { - Pos = MAP_APPFONT ( 124 , 126 ) ; + Pos = MAP_APPFONT ( 156 , 153 ) ; Size = MAP_APPFONT ( 50 , 8 ) ; }; PushButton PB_DBL_STD { - Pos = MAP_APPFONT ( 195 , 143 ) ; + Pos = MAP_APPFONT ( 137 , 167 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; Text [ en-US ] = "De~fault" ; diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 78bf271b0a78..f9d2b9078824 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -44,20 +44,21 @@ #include <cuires.hrc> #include "backgrnd.hrc" -#include <svx/svxitems.hrc> // RID_SVXITEM_COL_WHITE #include <svx/dialmgr.hxx> +#include <editeng/memberids.hrc> +#include <editeng/editrids.hrc> +#include <editeng/eerdll.hxx> // Tabellenhintergrund #define TBL_DEST_CELL 0 #define TBL_DEST_ROW 1 #define TBL_DEST_TBL 2 -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include "backgrnd.hxx" #include <svx/xtable.hxx> -#include <svx/opengrf.hxx> -#include <svx/impgrf.hxx> +#include <sfx2/opengrf.hxx> #include <svx/svxerr.hxx> #include <svx/drawitem.hxx> #include <dialmgr.hxx> @@ -1168,7 +1169,7 @@ BOOL SvxBackgroundTabPage::LoadLinkedGraphic_Impl() { BOOL bResult = ( aBgdGraphicPath.Len() > 0 ) && - ( GRFILTER_OK == LoadGraphic( aBgdGraphicPath, + ( GRFILTER_OK == GraphicFilter::LoadGraphic( aBgdGraphicPath, aBgdGraphicFilter, aBgdGraphic ) ); return bResult; @@ -1206,7 +1207,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() long nCount = pColorTable->Count(); XColorEntry* pEntry = NULL; Color aColWhite( COL_WHITE ); - String aStrWhite( SVX_RES( RID_SVXITEMS_COLOR_WHITE ) ); + String aStrWhite( EditResId( RID_SVXITEMS_COLOR_WHITE ) ); WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD ); aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); aBackgroundColorSet.SetStyle( nBits ); @@ -1880,7 +1881,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, if(bGraphTransparency) { - const GraphicObject* pObject = rBgdAttr.GetGraphicObject(SfxObjectShell::Current()); + const GraphicObject* pObject = rBgdAttr.GetGraphicObject(); if(pObject) aGraphTransMF.SetValue(lcl_TransparencyToPercent(pObject->GetAttr().GetTransparency())); else @@ -1900,8 +1901,7 @@ void SvxBackgroundTabPage::FillControls_Impl( const SvxBrushItem& rBgdAttr, // Grafik ist im Item vorhanden und muss nicht // geladen werden: - const Graphic* pGraphic = - rBgdAttr.GetGraphic( SfxObjectShell::Current() ); + const Graphic* pGraphic = rBgdAttr.GetGraphic(); if ( !pGraphic && aBtnPreview.IsChecked() ) bIsGraphicValid = LoadLinkedGraphic_Impl(); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index bb447997ba82..2d554e3dca7b 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -44,8 +44,8 @@ #include <svx/xtable.hxx> // XColorTable #include <svx/drawitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/shaditem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/shaditem.hxx> #include "border.hxx" #include <svx/dlgutil.hxx> #include <dialmgr.hxx> @@ -236,7 +236,7 @@ SvxBorderTabPage::SvxBorderTabPage( Window* pParent, mbUseMarginItem = rCoreAttrs.GetItemState(GetWhich(SID_ATTR_ALIGN_MARGIN),TRUE) != SFX_ITEM_UNKNOWN; // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rCoreAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rCoreAttrs ); if( mbUseMarginItem ) { diff --git a/cui/source/tabpages/borderconn.cxx b/cui/source/tabpages/borderconn.cxx index d67ec35cb05f..565ce58725ab 100644 --- a/cui/source/tabpages/borderconn.cxx +++ b/cui/source/tabpages/borderconn.cxx @@ -30,10 +30,10 @@ #include "borderconn.hxx" #include <svx/frmsel.hxx> -#include "svx/bolnitem.hxx" -#include <svx/boxitem.hxx> +#include "editeng/bolnitem.hxx" +#include <editeng/boxitem.hxx> #include <svx/algitem.hxx> -#include <svx/shaditem.hxx> +#include <editeng/shaditem.hxx> namespace svx { diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 22f002dfb92e..696c1c62cb23 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -29,7 +29,7 @@ #include "precompiled_cui.hxx" // include --------------------------------------------------------------- -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> @@ -42,6 +42,7 @@ #include <vcl/msgbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svtools/unitconv.hxx> #define _SVX_CHARDLG_CXX #include <svl/languageoptions.hxx> @@ -51,38 +52,38 @@ #include <svx/xtable.hxx> // XColorTable #include "chardlg.hxx" -#include "svx/fontitem.hxx" -#include <svx/postitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/cntritem.hxx> -#include <svx/langitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/shdditem.hxx> -#include <svx/escpitem.hxx> -#include <svx/prszitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cmapitem.hxx> -#include <svx/kernitem.hxx> -#include <svx/blnkitem.hxx> -#include "svx/flstitem.hxx" -#include <svx/akrnitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/colritem.hxx> +#include "editeng/fontitem.hxx" +#include <editeng/postitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/escpitem.hxx> +#include <editeng/prszitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/kernitem.hxx> +#include <editeng/blnkitem.hxx> +#include "editeng/flstitem.hxx" +#include <editeng/akrnitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/colritem.hxx> #include "svx/drawitem.hxx" #include "svx/dlgutil.hxx" #include <dialmgr.hxx> #include "svx/htmlmode.hxx" #include "cuicharmap.hxx" #include "chardlg.h" -#include <svx/emphitem.hxx> -#include <svx/charreliefitem.hxx> -#include <svx/twolinesitem.hxx> -#include <svx/charhiddenitem.hxx> +#include <editeng/emphitem.hxx> +#include <editeng/charreliefitem.hxx> +#include <editeng/twolinesitem.hxx> +#include <editeng/charhiddenitem.hxx> #include <svl/stritem.hxx> -#include <svx/charscaleitem.hxx> -#include <svx/charrotateitem.hxx> +#include <editeng/charscaleitem.hxx> +#include <editeng/charrotateitem.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <cuires.hrc> //CHINA001 #include <svl/intitem.hxx> //CHINA001 diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx index d95a2309cba2..2cc564c3c553 100644 --- a/cui/source/tabpages/connect.cxx +++ b/cui/source/tabpages/connect.cxx @@ -130,7 +130,7 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr FillTypeLB(); - const FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + const FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); SetFieldUnit( aMtrFldHorz1, eFUnit ); SetFieldUnit( aMtrFldHorz2, eFUnit ); SetFieldUnit( aMtrFldVert1, eFUnit ); diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 137c8039617f..6fb538a76947 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -35,8 +35,8 @@ #include <sfx2/sfxsids.hrc> #include <dialmgr.hxx> #include <svx/dlgutil.hxx> -#include <svx/sizeitem.hxx> -#include <svx/brshitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/brshitem.hxx> #include <grfpage.hxx> #include <svx/grfcrop.hxx> #include <grfpage.hrc> @@ -90,7 +90,7 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet ) SetExchangeSupport(); // set the correct metric - const FieldUnit eMetric = GetModuleFieldUnit( &rSet ); + const FieldUnit eMetric = GetModuleFieldUnit( rSet ); SetFieldUnit( aWidthMF, eMetric ); SetFieldUnit( aHeightMF, eMetric ); @@ -695,7 +695,7 @@ void SvxGrfCropPage::GraphicHasChanged( BOOL bFound ) aBottomMF.SetSpinSize(nSpin); //Originalgroesse anzeigen - const FieldUnit eMetric = GetModuleFieldUnit( &GetItemSet() ); + const FieldUnit eMetric = GetModuleFieldUnit( GetItemSet() ); MetricField aFld(this, WB_HIDE); SetFieldUnit( aFld, eMetric ); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 97d97237dba6..becc29e468bc 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -249,7 +249,7 @@ void SvxCaptionTabPage::Reset( const SfxItemSet& ) //------------Metrik einstellen----------------------------- - FieldUnit eFUnit = GetModuleFieldUnit( &rOutAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rOutAttrs ); switch ( eFUnit ) { diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index f155b5f9c970..c370b5183ebd 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -134,7 +134,7 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) : FreeResource(); - const FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + const FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); SetFieldUnit( aMtrFldLineDist, eFUnit ); SetFieldUnit( aMtrFldHelplineOverhang, eFUnit ); SetFieldUnit( aMtrFldHelplineDist, eFUnit ); diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9b4bb4a1086d..9bf88e151770 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -40,18 +40,18 @@ #include <i18npool/mslangid.hxx> #include <svtools/valueset.hxx> #include <helpid.hrc> -#include <svx/numitem.hxx> +#include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> #include <svx/gallery.hxx> #include <svl/urihelper.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> #include "cuicharmap.hxx" -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/dlgutil.hxx> #include <svx/xtable.hxx> #include <svx/drawitem.hxx> @@ -59,7 +59,7 @@ #include <svx/htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> -#include <svx/unolingu.hxx> +#include <editeng/unolingu.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -73,7 +73,7 @@ #include <algorithm> #include <vector> -#include "svx/opengrf.hxx" +#include "sfx2/opengrf.hxx" #include <cuires.hrc> //CHINA001 #include <sfx2/request.hxx> //CHINA001 diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 06ff0bd77909..e2ee5b11af8f 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -47,22 +47,24 @@ #include "helpid.hrc" #include "page.hxx" #include <svx/pageitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/pbinitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/sizeitem.hxx> -#include <svx/frmdiritem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/pbinitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/sizeitem.hxx> +#include <editeng/frmdiritem.hxx> #include "svx/dlgutil.hxx" #include <dialmgr.hxx> -#include <svx/paperinf.hxx> +#include <editeng/paperinf.hxx> #include <dialmgr.hxx> #include <sfx2/module.hxx> #include <svl/stritem.hxx> -#include <svx/dialmgr.hxx> // for RID_SVXSTR_PAPERBIN... -#include <svx/dialogs.hrc> // for RID_SVXSTR_PAPERBIN..., RID_SVXPAGE_PAGE +#include <svx/dialogs.hrc> // for RID_SVXPAGE_PAGE +#include <editeng/eerdll.hxx> +#include <editeng/editrids.hrc> // for RID_SVXSTR_PAPERBIN..., +#include <svx/svxids.hrc> // #i4219# #include <svtools/optionsdrawinglayer.hxx> @@ -344,7 +346,7 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) : } Init_Impl(); - FieldUnit eFUnit = GetModuleFieldUnit( &rAttr ); + FieldUnit eFUnit = GetModuleFieldUnit( rAttr ); SetFieldUnit( aLeftMarginEdit, eFUnit ); SetFieldUnit( aRightMarginEdit, eFUnit ); SetFieldUnit( aTopMarginEdit, eFUnit ); @@ -544,7 +546,7 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet ) String aBinName; if ( PAPERBIN_PRINTER_SETTINGS == nPaperBin ) - aBinName = SVX_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ); + aBinName = EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ); else aBinName = pImpl->mpDefPrinter->GetPaperBinName( (USHORT)nPaperBin ); @@ -997,10 +999,10 @@ IMPL_LINK( SvxPageDescPage, PaperBinHdl_Impl, ListBox *, EMPTYARG ) aPaperTrayBox.SetUpdateMode( FALSE ); aPaperTrayBox.Clear(); USHORT nEntryPos = aPaperTrayBox.InsertEntry( - SVX_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ) ); + EE_RESSTR( RID_SVXSTR_PAPERBIN_SETTINGS ) ); aPaperTrayBox.SetEntryData( nEntryPos, (void*)(ULONG)PAPERBIN_PRINTER_SETTINGS ); - String aPaperBin( SVX_RES( RID_SVXSTR_PAPERBIN ) ); + String aPaperBin( EditResId( RID_SVXSTR_PAPERBIN ) ); USHORT nBinCount = pImpl->mpDefPrinter->GetPaperBinCount(); for ( USHORT i = 0; i < nBinCount; ++i ) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 427cb8bd8e73..26eccfc0bb3e 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -38,27 +38,27 @@ #define _SVX_PARAGRPH_CXX 0 #include <svl/languageoptions.hxx> -#include <svx/pgrditem.hxx> +#include <editeng/pgrditem.hxx> #include <cuires.hrc> #include "paragrph.hrc" #include "paragrph.hxx" -#include <svx/frmdiritem.hxx> -#include <svx/lspcitem.hxx> -#include <svx/adjitem.hxx> -#include <svx/orphitem.hxx> -#include <svx/widwitem.hxx> -#include <svx/tstpitem.hxx> -#include <svx/pmdlitem.hxx> -#include <svx/spltitem.hxx> -#include <svx/hyznitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/brkitem.hxx> -#include <svx/keepitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/lspcitem.hxx> +#include <editeng/adjitem.hxx> +#include <editeng/orphitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/tstpitem.hxx> +#include <editeng/pmdlitem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/hyznitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/brkitem.hxx> +#include <editeng/keepitem.hxx> #include "svx/dlgutil.hxx" #include <dialmgr.hxx> #include "svx/htmlmode.hxx" -#include <svx/paravertalignitem.hxx> +#include <editeng/paravertalignitem.hxx> #include <svl/eitem.hxx> //add CHINA001 #include <sfx2/request.hxx> //add CHINA001 #include <svl/intitem.hxx> //add CHINA001 @@ -437,7 +437,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet& rSet ) String aEmpty; // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rSet ); + FieldUnit eFUnit = GetModuleFieldUnit( rSet ); SetFieldUnit( aLeftIndent, eFUnit ); SetFieldUnit( aRightIndent, eFUnit ); SetFieldUnit( aFLineIndent, eFUnit ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 7f290cab0fa9..a498a439c524 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -586,7 +586,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage( Window* pParent, const SfxItemSet& rIn m_bIsInRightToLeft(false) { FreeResource(); - FieldUnit eDlgUnit = GetModuleFieldUnit( &rInAttrs ); + FieldUnit eDlgUnit = GetModuleFieldUnit( rInAttrs ); SetFieldUnit( m_aHoriByMF, eDlgUnit, TRUE ); SetFieldUnit( m_aVertByMF, eDlgUnit, TRUE ); SetFieldUnit( m_aWidthMF , eDlgUnit, TRUE ); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 0862586f107d..e1e65404b1a2 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -40,7 +40,7 @@ #include <cuires.hrc> #include "tabstpge.hrc" -#include <svx/lrspitem.hxx> +#include <editeng/lrspitem.hxx> #include "tabstpge.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" @@ -150,7 +150,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent, // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rAttr ); + FieldUnit eFUnit = GetModuleFieldUnit( rAttr ); SetFieldUnit( aTabBox, eFUnit ); // Buttons initialisieren diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 9284ef249f87..cfff61fd5009 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -137,7 +137,7 @@ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& r { FreeResource(); - eFUnit = GetModuleFieldUnit( &rInAttrs ); + eFUnit = GetModuleFieldUnit( rInAttrs ); SfxItemPool* pPool = rOutAttrs.GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); eUnit = pPool->GetMetric( SDRATTR_TEXT_LEFTDIST ); diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index fd08b32e2c0e..93330fbeb4dd 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -54,7 +54,7 @@ #include "svx/dlgutil.hxx" #include <sfx2/request.hxx> //add CHINA001 #include <svx/ofaitem.hxx> //add CHINA001 -#include <svx/writingmodeitem.hxx> +#include <editeng/writingmodeitem.hxx> static USHORT pRanges[] = { @@ -130,7 +130,7 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs ) { FreeResource(); - FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); SetFieldUnit( aMtrFldLeft, eFUnit ); SetFieldUnit( aMtrFldRight, eFUnit ); SetFieldUnit( aMtrFldTop, eFUnit ); diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 72f5e697c958..774a58b4a34d 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -709,7 +709,7 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) : SetExchangeSupport(); // set Metrics - eFUnit = GetModuleFieldUnit( &rInAttrs ); + eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index ff98aaa6b16e..9060b6fb013e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -70,7 +70,7 @@ //#include "dlgname.hrc" #include <svx/svxdlg.hxx> //CHINA001 #include <dialmgr.hxx> -#include "svx/opengrf.hxx" +#include "sfx2/opengrf.hxx" #define DLGWIN this->GetParent()->GetParent() diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 8be39c35a222..4fa65d95221a 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -114,7 +114,7 @@ SvxHatchTabPage::SvxHatchTabPage SetExchangeSupport(); // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) { diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 9d941135533e..2fee90d5871b 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -32,7 +32,7 @@ #ifndef _SVX_SIZEITEM_HXX //autogen -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #endif #include <tools/shl.hxx> #include <tools/urlobj.hxx> @@ -61,14 +61,14 @@ #include <svx/svdmodel.hxx> #include <svx/numvset.hxx> #include <vcl/msgbox.hxx> -#include <svx/numitem.hxx> -#include <svx/svxenum.hxx> +#include <editeng/numitem.hxx> +#include <editeng/svxenum.hxx> #include <sfx2/objsh.hxx> -#include <svx/brshitem.hxx> +#include <editeng/brshitem.hxx> #include <svx/gallery.hxx> #include <svx/xbitmap.hxx> #include <unotools/localfilehelper.hxx> -#include "svx/opengrf.hxx" +#include "sfx2/opengrf.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -171,7 +171,7 @@ SvxLineTabPage::SvxLineTabPage SetExchangeSupport(); // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) { @@ -1552,7 +1552,6 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) PopupMenu* pPopup = new PopupMenu; String aEmptyStr; - SfxObjectShell *pDocSh = SfxObjectShell::Current(); nNumMenuGalleryItems=aGrfNames.Count(); for(long i = 0; i < nNumMenuGalleryItems; i++) @@ -1572,7 +1571,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton ) pInfo->pBrushItem = pBrushItem; pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i); aGrfBrushItems.Insert(pInfo, i); - const Graphic* pGraphic = pBrushItem->GetGraphic(pDocSh); + const Graphic* pGraphic = pBrushItem->GetGraphic(); if(pGraphic) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 10d4fcf3ef7c..5f1b385e8137 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -119,7 +119,7 @@ SvxLineDefTabPage::SvxLineDefTabPage SetExchangeSupport(); // Metrik einstellen - eFUnit = GetModuleFieldUnit( &rInAttrs ); + eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) { diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 31fb11141368..3accd144efcc 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -97,7 +97,7 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs SetExchangeSupport(); // Metrik einstellen - FieldUnit eFUnit = GetModuleFieldUnit( &rInAttrs ); + FieldUnit eFUnit = GetModuleFieldUnit( rInAttrs ); switch ( eFUnit ) { diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index 3cc02662895e..e42f85c811f1 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -40,12 +40,12 @@ #include <svx/dialogs.hrc> #include <cuires.hrc> #include "transfrm.hrc" -#include <svx/sizeitem.hxx> +#include <editeng/sizeitem.hxx> #include "transfrm.hxx" #include <dialmgr.hxx> #include "svx/dlgutil.hxx" -#include <svx/svxenum.hxx> +#include <editeng/svxenum.hxx> #include "svx/anchorid.hxx" #include <sfx2/module.hxx> #include <svl/rectitem.hxx> @@ -256,7 +256,7 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs ) void SvxAngleTabPage::Construct() { DBG_ASSERT(pView, "No valid view (!)"); - eDlgUnit = GetModuleFieldUnit(&GetItemSet()); + eDlgUnit = GetModuleFieldUnit(GetItemSet()); SetFieldUnit(aMtrPosX, eDlgUnit, TRUE); SetFieldUnit(aMtrPosY, eDlgUnit, TRUE); @@ -542,7 +542,7 @@ void SvxSlantTabPage::Construct() { // get the range DBG_ASSERT(pView, "no valid view (!)"); - eDlgUnit = GetModuleFieldUnit(&GetItemSet()); + eDlgUnit = GetModuleFieldUnit(GetItemSet()); SetFieldUnit(aMtrRadius, eDlgUnit, TRUE); { // #i75273# @@ -773,7 +773,7 @@ void SvxPositionSizeTabPage::Construct() { // get range and work area DBG_ASSERT( mpView, "no valid view (!)" ); - meDlgUnit = GetModuleFieldUnit( &GetItemSet() ); + meDlgUnit = GetModuleFieldUnit( GetItemSet() ); SetFieldUnit( maMtrPosX, meDlgUnit, TRUE ); SetFieldUnit( maMtrPosY, meDlgUnit, TRUE ); SetFieldUnit( maMtrWidth, meDlgUnit, TRUE ); diff --git a/cui/util/hidother.src b/cui/util/hidother.src index 4bb9dedb38fa..ddce17eebb23 100644 --- a/cui/util/hidother.src +++ b/cui/util/hidother.src @@ -140,6 +140,8 @@ hidspecial HID_OFADLG_TREELISTBOX { HelpId = HID_OFADLG_TREELI hidspecial HID_OFAPAGE_AUTOCORR_CLB { HelpId = HID_OFAPAGE_AUTOCORR_CLB; }; hidspecial HID_OFAPAGE_AUTOFORMAT_CLB { HelpId = HID_OFAPAGE_AUTOFORMAT_CLB; }; hidspecial HID_OFAPAGE_MSFLTR2_CLB { HelpId = HID_OFAPAGE_MSFLTR2_CLB ; }; +hidspecial HID_OFAPAGE_QUOTE_CLB { HelpId = HID_OFAPAGE_QUOTE_CLB; }; +hidspecial HID_OFAPAGE_QUOTE_SW_CLB { HelpId = HID_OFAPAGE_QUOTE_SW_CLB; }; hidspecial HID_OFA_CONNPOOL_DRIVERLIST { HelpId = HID_OFA_CONNPOOL_DRIVERLIST; }; hidspecial HID_OFA_FONT_SUBST_CLB { HelpId = HID_OFA_FONT_SUBST_CLB; }; hidspecial HID_OPTIONS_COLORCONFIG_COLORLIST_WIN { HelpID = HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ;}; diff --git a/cui/util/makefile.mk b/cui/util/makefile.mk index fe7efca0747d..cf2a6fcc3dc5 100644 --- a/cui/util/makefile.mk +++ b/cui/util/makefile.mk @@ -56,11 +56,11 @@ SHL1LIBS= \ SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(AVMEDIALIB) \ $(SFX2LIB) \ - $(GOODIESLIB) \ $(BASEGFXLIB) \ $(BASICLIB) \ $(LNGLIB) \ diff --git a/cui/util/makefile.pmk b/cui/util/makefile.pmk index e0fffdb1fdeb..5d4fb6b9e517 100644 --- a/cui/util/makefile.pmk +++ b/cui/util/makefile.pmk @@ -25,9 +25,6 @@ # #************************************************************************* -# define SVX_DLLIMPLEMENTATION (see @ svxdllapi.h) -CDEFS += -DSVX_DLLIMPLEMENTATION - .IF "$(ENABLE_GTK)" != "" CFLAGS+=-DENABLE_GTK .ENDIF diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx index c009a95b5c2f..5c3fdba085c3 100644 --- a/extensions/source/propctrlr/eventhandler.cxx +++ b/extensions/source/propctrlr/eventhandler.cxx @@ -63,6 +63,7 @@ /** === end UNO includes === **/ #include <comphelper/namedvaluecollection.hxx> +#include <comphelper/evtmethodhelper.hxx> #include <comphelper/types.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> @@ -171,36 +172,6 @@ namespace pcr namespace { //.................................................................... - Sequence< ::rtl::OUString > lcl_getListenerMethodsForType( const Type& type ) - { - typelib_InterfaceTypeDescription *pType=0; - type.getDescription( (typelib_TypeDescription**)&pType); - - if ( !pType ) - return Sequence< ::rtl::OUString>(); - - Sequence< ::rtl::OUString > aNames( pType->nMembers ); - ::rtl::OUString* pNames = aNames.getArray(); - for ( sal_Int32 i = 0; i < pType->nMembers; ++i, ++pNames) - { - // the decription reference - typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i]; - // the description for the reference - typelib_TypeDescription* pMemberDescription = NULL; - typelib_typedescriptionreference_getDescription( &pMemberDescription, pMemberDescriptionReference ); - if ( pMemberDescription ) - { - typelib_InterfaceMemberTypeDescription* pRealMemberDescription = - reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription); - *pNames = pRealMemberDescription->pMemberName; - } - } - - typelib_typedescription_release( (typelib_TypeDescription*)pType ); - return aNames; - } - - //.................................................................... #define DESCRIBE_EVENT( asciinamespace, asciilistener, asciimethod, id_postfix ) \ s_aKnownEvents.insert( EventMap::value_type( \ ::rtl::OUString::createFromAscii( asciimethod ), \ @@ -832,7 +803,7 @@ namespace pcr continue; // loop through all methods - Sequence< ::rtl::OUString > aMethods( lcl_getListenerMethodsForType( *pListeners ) ); + Sequence< ::rtl::OUString > aMethods( comphelper::getEventMethodsForType( *pListeners ) ); const ::rtl::OUString* pMethods = aMethods.getConstArray(); sal_uInt32 methodCount = aMethods.getLength(); diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx index 82ef033dea21..c7c52b60a910 100644 --- a/extensions/source/propctrlr/fontdialog.cxx +++ b/extensions/source/propctrlr/fontdialog.cxx @@ -51,24 +51,24 @@ #include <com/sun/star/awt/FontStrikeout.hpp> #include "formstrings.hxx" #include "fontitemids.hxx" -#include <svx/charreliefitem.hxx> +#include <editeng/charreliefitem.hxx> #ifndef _SVX_EMPHITEM_HXX -#include <svx/emphitem.hxx> +#include <editeng/emphitem.hxx> #endif -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> -#include <svx/postitem.hxx> -#include <svx/wghtitem.hxx> -#include <svx/udlnitem.hxx> -#include <svx/crsditem.hxx> -#include <svx/colritem.hxx> -#include <svx/flstitem.hxx> -#include <svx/langitem.hxx> -#include <svx/wrlmitem.hxx> -#include <svx/cmapitem.hxx> -#include <svx/cntritem.hxx> -#include <svx/shdditem.hxx> -#include <svx/flstitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/postitem.hxx> +#include <editeng/wghtitem.hxx> +#include <editeng/udlnitem.hxx> +#include <editeng/crsditem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/flstitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/wrlmitem.hxx> +#include <editeng/cmapitem.hxx> +#include <editeng/cntritem.hxx> +#include <editeng/shdditem.hxx> +#include <editeng/flstitem.hxx> #include <svtools/ctrltool.hxx> #include <tools/diagnose_ex.h> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/extensions/source/propctrlr/makefile.mk b/extensions/source/propctrlr/makefile.mk index 9a212bc61925..27255c9e5f46 100644 --- a/extensions/source/propctrlr/makefile.mk +++ b/extensions/source/propctrlr/makefile.mk @@ -116,6 +116,7 @@ SHL1TARGET= $(TARGET)$(DLLPOSTFIX) SHL1VERSIONMAP= $(TARGET).map SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SVXCORELIB) \ $(SVXLIB) \ $(SFXLIB) \ diff --git a/forms/inc/pch/precompiled_forms.hxx b/forms/inc/pch/precompiled_forms.hxx index 368ff26007a4..f75e8ca4316a 100644 --- a/forms/inc/pch/precompiled_forms.hxx +++ b/forms/inc/pch/precompiled_forms.hxx @@ -343,18 +343,18 @@ #include "svl/solar.hrc" #include "svtools/transfer.hxx" -#include "svx/editdata.hxx" -#include "svx/editeng.hxx" -#include "svx/editobj.hxx" -#include "svx/editstat.hxx" -#include "svx/editview.hxx" -#include "svx/eeitem.hxx" -#include "svx/frmdir.hxx" -#include "svx/scripttypeitem.hxx" -#include "svx/svxenum.hxx" +#include "editeng/editdata.hxx" +#include "editeng/editeng.hxx" +#include "editeng/editobj.hxx" +#include "editeng/editstat.hxx" +#include "editeng/editview.hxx" +#include "editeng/eeitem.hxx" +#include "editeng/frmdir.hxx" +#include "editeng/scripttypeitem.hxx" +#include "editeng/svxenum.hxx" #include "svx/svxids.hrc" -#include "svx/unoedsrc.hxx" -#include "svx/unofored.hxx" +#include "editeng/unoedsrc.hxx" +#include "editeng/unofored.hxx" #include "toolkit/helper/emptyfontdescriptor.hxx" diff --git a/forms/prj/build.lst b/forms/prj/build.lst index 4e59eecd0365..ec07ab8e243c 100644 --- a/forms/prj/build.lst +++ b/forms/prj/build.lst @@ -1,4 +1,4 @@ -fm forms : l10n svx sfx2 QADEVOOO:qadevOOo NULL +fm forms : l10n oovbaapi svx sfx2 QADEVOOO:qadevOOo NULL fm forms usr1 - all fm_mkofrm NULL fm forms\inc nmake - all fm_inc NULL fm forms\source\inc get - all fm_sinc NULL diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx index 825dc05c3675..427d0c6ed190 100644 --- a/forms/source/inc/InterfaceContainer.hxx +++ b/forms/source/inc/InterfaceContainer.hxx @@ -272,6 +272,9 @@ protected: void implCheckIndex( const sal_Int32 _nIndex ) SAL_THROW( ( ::com::sun::star::lang::IndexOutOfBoundsException ) ); private: + // hack for Vba Events + void fakeVbaEventsHack( sal_Int32 _nIndex ); + // the runtime event format has changed from version SO5.2 to OOo enum EventFormat { diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index ab605dbb9324..b594df158d17 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -57,13 +57,20 @@ #include <memory> //......................................................................... +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/document/XCodeNameQuery.hpp> +#include <ooo/vba/XVBAToOOEventDescGen.hpp> +#include <comphelper/processfactory.hxx> + namespace frm { //......................................................................... +using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; +using namespace ::com::sun::star::document; using namespace ::com::sun::star::container; using namespace ::com::sun::star::script; using namespace ::com::sun::star::io; @@ -79,6 +86,90 @@ namespace } } +bool +lcl_hasVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) +{ + const ScriptEventDescriptor* pDesc = sEvents.getConstArray(); + const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() ); + for ( ; pDesc != pEnd; ++pDesc ) + { + if ( pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) ) + return true; + } + return false; +} + +Sequence< ScriptEventDescriptor > +lcl_stripVbaEvents( const Sequence< ScriptEventDescriptor >& sEvents ) +{ + Sequence< ScriptEventDescriptor > sStripped( sEvents.getLength() ); + + const ScriptEventDescriptor* pDesc = sEvents.getConstArray(); + const ScriptEventDescriptor* pEnd = ( pDesc + sEvents.getLength() ); + sal_Int32 nCopied = 0; + for ( ; pDesc != pEnd; ++pDesc ) + { + if ( !pDesc->ScriptType.equals( rtl::OUString::createFromAscii( "VBAInterop" ) ) ) + { + sStripped[ nCopied++ ] = *pDesc; + } + } + if ( nCopied ) + sStripped.realloc( nCopied ); + return sStripped; +} + +void +OInterfaceContainer::fakeVbaEventsHack( sal_Int32 _nIndex ) +{ + // we are dealing with form controls + try + { + Reference< XFormComponent > xForm( static_cast< XContainer* >(this), UNO_QUERY_THROW ); + // grand-parent should be the model, no parent ? if not + // we'll ignore, we'll get called back here anyway ) + Reference< XChild > xChild( xForm->getParent(), UNO_QUERY_THROW ); + Reference< XModel > xDocOwner( xChild->getParent(), UNO_QUERY ); + OSL_TRACE(" Is DOC ????? %s", xDocOwner.is() ? "true" : "false" ); + if ( xDocOwner.is() ) + { + bool hasVBABindings = lcl_hasVbaEvents( m_xEventAttacher->getScriptEvents( _nIndex ) ); + if ( hasVBABindings ) + { + OSL_TRACE("Has VBA bindings already, returning "); + return; + } + Reference< XMultiServiceFactory > xFac( comphelper::getProcessServiceFactory(), UNO_QUERY ); + Reference< XMultiServiceFactory > xDocFac( xDocOwner, UNO_QUERY ); + if ( xFac.is() && xDocFac.is() ) + { + try + { + Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier( xFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBAToOOEventDesc" ) ), UNO_QUERY_THROW ); + Reference< XInterface > xIf( getByIndex( _nIndex ) , UNO_QUERY_THROW ); + Reference< XCodeNameQuery > xNameQuery( xDocFac->createInstance( rtl::OUString::createFromAscii( "ooo.vba.VBACodeNameProvider" ) ), UNO_QUERY_THROW ); + + rtl::OUString sCodeName; + sCodeName = xNameQuery->getCodeNameForObject( xIf ); + Reference< XPropertySet > xProps( xIf, UNO_QUERY ); + rtl::OUString sServiceName; + xProps->getPropertyValue( rtl::OUString::createFromAscii("DefaultControl" ) ) >>= sServiceName; + + Sequence< ScriptEventDescriptor > vbaEvents = xDescSupplier->getEventDescriptions( xFac->createInstance( sServiceName ), sCodeName ); + // register the vba script events + if ( m_xEventAttacher.is() ) + m_xEventAttacher->registerScriptEvents( _nIndex, vbaEvents ); + } + catch( Exception& ){ OSL_TRACE("lcl_fakevbaevents - Caught Exception trying to create control eventstuff "); } + } + + } + } + catch( Exception& ) + { + } + +} //================================================================== //= ElementDescription //================================================================== @@ -785,6 +876,23 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex, const Reference< XProper { m_xEventAttacher->insertEntry(_nIndex); m_xEventAttacher->attach( _nIndex, pElementMetaData->xInterface, makeAny( _rxElement ) ); + // insert fake events? + Reference< XEventAttacherManager > xMgr ( pElementMetaData->xInterface, UNO_QUERY ); + if ( xMgr.is() ) + { + OInterfaceContainer* pIfcMgr = dynamic_cast< OInterfaceContainer* >( xMgr.get() ); + sal_Int32 nLen = pIfcMgr->getCount(); + for ( sal_Int32 i = 0; (i < nLen) && pIfcMgr ; ++i ) + { + // add fake events to the control at index i + pIfcMgr->fakeVbaEventsHack( i ); + } + } + else + { + // add fake events to the control at index i + fakeVbaEventsHack( _nIndex ); + } } // notify derived classes @@ -1079,20 +1187,29 @@ void SAL_CALL OInterfaceContainer::removeByName(const ::rtl::OUString& Name) thr //------------------------------------------------------------------------ void SAL_CALL OInterfaceContainer::registerScriptEvent( sal_Int32 nIndex, const ScriptEventDescriptor& aScriptEvent ) throw(IllegalArgumentException, RuntimeException) { + OSL_TRACE("*** registerScriptEvent %d", nIndex); if ( m_xEventAttacher.is() ) + { m_xEventAttacher->registerScriptEvent( nIndex, aScriptEvent ); + fakeVbaEventsHack( nIndex ); // add fake vba events + } } //------------------------------------------------------------------------ void SAL_CALL OInterfaceContainer::registerScriptEvents( sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& aScriptEvents ) throw(IllegalArgumentException, RuntimeException) { + OSL_TRACE("*** registerScriptEvent(s) %d", nIndex); if ( m_xEventAttacher.is() ) + { m_xEventAttacher->registerScriptEvents( nIndex, aScriptEvents ); + fakeVbaEventsHack( nIndex ); // add fake vba events + } } //------------------------------------------------------------------------ void SAL_CALL OInterfaceContainer::revokeScriptEvent( sal_Int32 nIndex, const ::rtl::OUString& aListenerType, const ::rtl::OUString& aEventMethod, const ::rtl::OUString& aRemoveListenerParam ) throw(IllegalArgumentException, RuntimeException) { + OSL_TRACE("*** revokeScriptEvent %d listenertype %s, eventMethod %s", nIndex, rtl::OUStringToOString( aListenerType, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( aEventMethod, RTL_TEXTENCODING_UTF8 ).getStr()); if ( m_xEventAttacher.is() ) m_xEventAttacher->revokeScriptEvent( nIndex, aListenerType, aEventMethod, aRemoveListenerParam ); } @@ -1121,9 +1238,16 @@ void SAL_CALL OInterfaceContainer::removeEntry( sal_Int32 nIndex ) throw(Illegal //------------------------------------------------------------------------ Sequence< ScriptEventDescriptor > SAL_CALL OInterfaceContainer::getScriptEvents( sal_Int32 nIndex ) throw(IllegalArgumentException, RuntimeException) { + OSL_TRACE("getScriptEvents"); Sequence< ScriptEventDescriptor > aReturn; if ( m_xEventAttacher.is() ) + { aReturn = m_xEventAttacher->getScriptEvents( nIndex ); + if ( lcl_hasVbaEvents( aReturn ) ) + { + aReturn = lcl_stripVbaEvents( aReturn ); + } + } return aReturn; } diff --git a/forms/source/misc/makefile.mk b/forms/source/misc/makefile.mk index 5687e3856668..64af07b00c01 100644 --- a/forms/source/misc/makefile.mk +++ b/forms/source/misc/makefile.mk @@ -41,6 +41,7 @@ ENABLE_EXCEPTIONS=TRUE # --- Types ------------------------------------- INCPRE+=$(SOLARINCDIR)$/offuh +INCPRE*=$(INCCOM)$/$(TARGET) # --- Files ------------------------------------- @@ -58,3 +59,12 @@ SLOFILES= $(SLO)$/limitedformats.obj \ .INCLUDE : target.mk +ALLTAR : \ + $(MISC)$/$(TARGET).don \ + +$(SLOFILES) : $(MISC)$/$(TARGET).don + +$(MISC)$/$(TARGET).don : $(SOLARBINDIR)$/oovbaapi.rdb + +$(CPPUMAKER) -O$(INCCOM)$/$(TARGET) -BUCR $(SOLARBINDIR)$/oovbaapi.rdb -X$(SOLARBINDIR)$/types.rdb && echo > $@ + echo $@ + diff --git a/forms/source/richtext/attributedispatcher.cxx b/forms/source/richtext/attributedispatcher.cxx index ac6ec5532aff..82df2c3fbbf1 100644 --- a/forms/source/richtext/attributedispatcher.cxx +++ b/forms/source/richtext/attributedispatcher.cxx @@ -31,7 +31,7 @@ /** === begin UNO includes === **/ /** === end UNO includes === **/ -#include <svx/editview.hxx> +#include <editeng/editview.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/clipboarddispatcher.cxx b/forms/source/richtext/clipboarddispatcher.cxx index dd32167bfdff..97b2ec1cba84 100644 --- a/forms/source/richtext/clipboarddispatcher.cxx +++ b/forms/source/richtext/clipboarddispatcher.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "clipboarddispatcher.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> /** === begin UNO includes === **/ #include <com/sun/star/lang/DisposedException.hpp> diff --git a/forms/source/richtext/parametrizedattributedispatcher.cxx b/forms/source/richtext/parametrizedattributedispatcher.cxx index 16659dbf999e..60791969c119 100644 --- a/forms/source/richtext/parametrizedattributedispatcher.cxx +++ b/forms/source/richtext/parametrizedattributedispatcher.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "parametrizedattributedispatcher.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 3027c1a7e9f6..0755510cdd48 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -49,7 +49,7 @@ #include <vcl/svapp.hxx> #include <svx/svxids.hrc> -#include <svx/editview.hxx> +#include <editeng/editview.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <sfx2/msgpool.hxx> diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 191b6a37ac05..1105f8a51c1c 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -29,14 +29,14 @@ #include "precompiled_forms.hxx" #include "richtextengine.hxx" #include <svl/itempool.hxx> -#include <svx/eeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editobj.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #define ITEMID_FONT EE_CHAR_FONTHEIGHT -#include <svx/fontitem.hxx> +#include <editeng/fontitem.hxx> #define ITEMID_LANGUAGE EE_CHAR_LANGUAGE -#include <svx/langitem.hxx> +#include <editeng/langitem.hxx> #include <vcl/svapp.hxx> #include <vcl/mapunit.hxx> #include <vcl/mapmod.hxx> diff --git a/forms/source/richtext/richtextengine.hxx b/forms/source/richtext/richtextengine.hxx index c40b5bcc081a..c3a1eb36550c 100644 --- a/forms/source/richtext/richtextengine.hxx +++ b/forms/source/richtext/richtextengine.hxx @@ -27,7 +27,7 @@ #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX #define FORMS_SOURCE_RICHTEXT_RICHTEXTENGINE_HXX -#include <svx/editeng.hxx> +#include <editeng/editeng.hxx> #include <tools/link.hxx> #include <vector> diff --git a/forms/source/richtext/richtextimplcontrol.cxx b/forms/source/richtext/richtextimplcontrol.cxx index 68a6a5cc7e49..3a82822f6701 100644 --- a/forms/source/richtext/richtextimplcontrol.cxx +++ b/forms/source/richtext/richtextimplcontrol.cxx @@ -30,16 +30,16 @@ #include "richtextimplcontrol.hxx" #include "textattributelistener.hxx" #include "richtextengine.hxx" -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/editstat.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/editstat.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/scripttypeitem.hxx> +#include <editeng/scripttypeitem.hxx> -#include <svx/editobj.hxx> +#include <editeng/editobj.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <vcl/mapunit.hxx> diff --git a/forms/source/richtext/richtextimplcontrol.hxx b/forms/source/richtext/richtextimplcontrol.hxx index 03ed602a0d9f..619766bbfc4e 100644 --- a/forms/source/richtext/richtextimplcontrol.hxx +++ b/forms/source/richtext/richtextimplcontrol.hxx @@ -31,7 +31,7 @@ #include "richtextviewport.hxx" #include "richtextengine.hxx" #include <vcl/scrbar.hxx> -#include <svx/editdata.hxx> +#include <editeng/editdata.hxx> #include <map> diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 0e4410960a3a..46a77c6dd791 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -44,7 +44,7 @@ #include <comphelper/guarding.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <svx/editstat.hxx> +#include <editeng/editstat.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/richtext/richtextunowrapper.cxx b/forms/source/richtext/richtextunowrapper.cxx index 14bf431a1efb..1d3f98467aa7 100644 --- a/forms/source/richtext/richtextunowrapper.cxx +++ b/forms/source/richtext/richtextunowrapper.cxx @@ -32,9 +32,12 @@ /** === begin UNO includes === **/ #include <com/sun/star/container/XNameContainer.hpp> /** === end UNO includes === **/ -#include <svx/unofored.hxx> -#include <svx/editview.hxx> -#include <svx/unoipset.hxx> +#include <editeng/unofored.hxx> +#include <editeng/editview.hxx> +#include <editeng/unoipset.hxx> +#include <svx/svdpool.hxx> +#include <svx/svdobj.hxx> +#include <editeng/unoprnms.hxx> //........................................................................ namespace frm @@ -61,7 +64,7 @@ namespace frm { MAP_CHAR_LEN("ParaUserDefinedAttributes"), EE_PARA_XMLATTRIBS, &::getCppuType( static_cast< const Reference< XNameContainer >* >( NULL ) ), 0, 0 }, { NULL, 0, 0, NULL, 0, 0 } }; - static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap ); + static SvxItemPropertySet aTextEnginePropertySet( aTextEnginePropertyMap, SdrObject::GetGlobalDrawObjectItemPool() ); return &aTextEnginePropertySet; } } diff --git a/forms/source/richtext/richtextunowrapper.hxx b/forms/source/richtext/richtextunowrapper.hxx index 98506108da16..a461eb4d507e 100644 --- a/forms/source/richtext/richtextunowrapper.hxx +++ b/forms/source/richtext/richtextunowrapper.hxx @@ -28,8 +28,8 @@ #ifndef FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX #define FORMS_SOURCE_RICHTEXT_RICHTEXTUNOWRAPPER_HXX -#include <svx/unotext.hxx> -#include <svx/unoedsrc.hxx> +#include <editeng/unotext.hxx> +#include <editeng/unoedsrc.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/richtextvclcontrol.cxx b/forms/source/richtext/richtextvclcontrol.cxx index 5964427b4a95..48d458288d40 100644 --- a/forms/source/richtext/richtextvclcontrol.cxx +++ b/forms/source/richtext/richtextvclcontrol.cxx @@ -50,13 +50,14 @@ #endif #include "com/sun/star/ui/dialogs/TemplateDescription.hpp" #endif -#include <svx/scripttypeitem.hxx> -#include <svx/editeng.hxx> -#include <svx/editview.hxx> -#include <svx/eeitem.hxx> -#include <svx/fontitem.hxx> -#include <svx/fhgtitem.hxx> - +#include <editeng/scripttypeitem.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> +#include <editeng/eeitem.hxx> +#include <editeng/fontitem.hxx> +#include <editeng/fhgtitem.hxx> +#include <editeng/editids.hrc> +#include <svx/svxids.hrc> #include <memory> //........................................................................ diff --git a/forms/source/richtext/richtextviewport.cxx b/forms/source/richtext/richtextviewport.cxx index 6c9e77676b12..ffeda61e6b0c 100644 --- a/forms/source/richtext/richtextviewport.cxx +++ b/forms/source/richtext/richtextviewport.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "richtextviewport.hxx" -#include <svx/editview.hxx> +#include <editeng/editview.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/rtattributehandler.cxx b/forms/source/richtext/rtattributehandler.cxx index 5ed3cf9dc360..c19fe516beb2 100644 --- a/forms/source/richtext/rtattributehandler.cxx +++ b/forms/source/richtext/rtattributehandler.cxx @@ -32,7 +32,7 @@ #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svx/eeitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/itemset.hxx> #include <svl/itempool.hxx> #include <vcl/mapunit.hxx> @@ -40,18 +40,18 @@ #include <vcl/outdev.hxx> #define ITEMID_ADJUST EE_PARA_JUST -#include <svx/adjitem.hxx> +#include <editeng/adjitem.hxx> #define ITEMID_WEIGHT EE_CHAR_WEIGHT -#include <svx/wghtitem.hxx> +#include <editeng/wghtitem.hxx> #define ITEMID_ESCAPEMENT EE_CHAR_ESCAPEMENT -#include <svx/escpitem.hxx> +#include <editeng/escpitem.hxx> #define ITEMID_LINESPACING EE_PARA_SBL -#include <svx/lspcitem.hxx> +#include <editeng/lspcitem.hxx> #define ITEMID_FONTHEIGHT EE_CHAR_FONTHEIGHT -#include <svx/fhgtitem.hxx> +#include <editeng/fhgtitem.hxx> #define ITEMID_FRAMEDIR EE_PARA_WRITINGDIR -#include <svx/frmdiritem.hxx> -#include <svx/scripttypeitem.hxx> +#include <editeng/frmdiritem.hxx> +#include <editeng/scripttypeitem.hxx> //........................................................................ namespace frm diff --git a/forms/source/richtext/rtattributehandler.hxx b/forms/source/richtext/rtattributehandler.hxx index 6559e2b44638..4e15cbc44050 100644 --- a/forms/source/richtext/rtattributehandler.hxx +++ b/forms/source/richtext/rtattributehandler.hxx @@ -30,8 +30,8 @@ #include "rtattributes.hxx" #include <rtl/ref.hxx> -#include <svx/svxenum.hxx> -#include <svx/frmdir.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/frmdir.hxx> class SfxItemSet; class SfxPoolItem; diff --git a/forms/source/richtext/specialdispatchers.cxx b/forms/source/richtext/specialdispatchers.cxx index f6fa4f248cdb..2540c9d797f2 100644 --- a/forms/source/richtext/specialdispatchers.cxx +++ b/forms/source/richtext/specialdispatchers.cxx @@ -28,13 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_forms.hxx" #include "specialdispatchers.hxx" -#include <svx/editeng.hxx> -#include <svx/editview.hxx> +#include <editeng/editeng.hxx> +#include <editeng/editview.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif #define ITEMID_SCRIPTSPACE SID_ATTR_PARA_SCRIPTSPACE -#include <svx/scriptspaceitem.hxx> +#include <editeng/scriptspaceitem.hxx> //........................................................................ namespace frm diff --git a/forms/util/makefile.mk b/forms/util/makefile.mk index 8444bcf43b2c..66de3cb83fb2 100644 --- a/forms/util/makefile.mk +++ b/forms/util/makefile.mk @@ -54,6 +54,7 @@ LIB1FILES=\ SHL1TARGET=$(TARGET)$(DLLPOSTFIX) SHL1STDLIBS= \ + $(EDITENGLIB) \ $(SALLIB) \ $(CPPULIB) \ $(CPPUHELPERLIB) \ diff --git a/setup_native/source/win32/customactions/reg64/makefile.mk b/setup_native/source/win32/customactions/reg64/makefile.mk index 04117c10365d..04117c10365d 100755..100644 --- a/setup_native/source/win32/customactions/reg64/makefile.mk +++ b/setup_native/source/win32/customactions/reg64/makefile.mk diff --git a/setup_native/source/win32/customactions/reg64/reg64.cxx b/setup_native/source/win32/customactions/reg64/reg64.cxx index 0d8ce76cb0df..2264a228030d 100755..100644 --- a/setup_native/source/win32/customactions/reg64/reg64.cxx +++ b/setup_native/source/win32/customactions/reg64/reg64.cxx @@ -365,13 +365,13 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView) case(-1): if (isInstall4AllUsers) { - key = HKEY_CURRENT_USER; - OutputDebugStringFormat(L"HKEY_CURRENT_USER" ); + key = HKEY_LOCAL_MACHINE; + OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" ); } else { - key = HKEY_LOCAL_MACHINE; - OutputDebugStringFormat(L"HKEY_LOCAL_MACHINE" ); + key = HKEY_CURRENT_USER; + OutputDebugStringFormat(L"HKEY_CURRENT_USER" ); } break; case(0): @@ -390,7 +390,9 @@ bool DoRegEntries( MSIHANDLE& rhMSI, OPERATION op, MSIHANDLE& rhView) key = HKEY_USERS; OutputDebugStringFormat(L"HKEY_USERS" ); break; - + default: + OutputDebugStringFormat(L"Unknown Root!" ); + break; } OutputDebugStringFormat(L"Key:"); diff --git a/wizards/com/sun/star/wizards/letter/LocaleCodes.java b/wizards/com/sun/star/wizards/letter/LocaleCodes.java index 9adbc48fc06b..bf0292c4d6af 100644 --- a/wizards/com/sun/star/wizards/letter/LocaleCodes.java +++ b/wizards/com/sun/star/wizards/letter/LocaleCodes.java @@ -41,7 +41,7 @@ public class LocaleCodes extends Resource public LocaleCodes(XMultiServiceFactory xmsf) { super(xmsf, UNIT_NAME, MODULE_NAME); - allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src + allLanguageStrings = getStringList(16750); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src } public String getLanguageString(String MSID) |