diff options
Diffstat (limited to 'svx/source/form')
32 files changed, 83 insertions, 483 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 2723e11ddc..f38c341847 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -37,7 +37,7 @@ #include <svx/dialmgr.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index b7d117b3de..215e74d72f 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -45,7 +45,7 @@ #include <rtl/ustrbuf.hxx> #include <sfx2/filedlghelper.hxx> #include <svtools/urlcontrol.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <unotools/confignode.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index c56b4b77f6..c54c9f8e65 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,9 +44,9 @@ #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/viewoptions.hxx> -#include <svtools/svtools.hrc> +#include <unotools/pathoptions.hxx> +#include <unotools/viewoptions.hxx> +#include <svl/svtools.hrc> #include <sfx2/app.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/objitem.hxx> @@ -816,8 +816,8 @@ namespace svxform // create a resource manager, for the svx resource file // and the UI locale ByteString aResourceFile( "svx" ); - ResMgr* pResMgr = ResMgr::CreateResMgr( - aResourceFile.GetBuffer(), + ResMgr* pResMgr = ResMgr::CreateResMgr( + aResourceFile.GetBuffer(), Application::GetSettings().GetUILocale() ); // load the resources for the AddSubmission modal dialog. @@ -833,7 +833,7 @@ namespace svxform // clean up: remove context, and delete the resource manager // ( Increment(..) is needed since PopContext() requires that // the file pointer is at the end. ) - pResMgr->Increment( pResMgr->GetRemainSize() ); + pResMgr->Increment( pResMgr->GetRemainSize() ); pResMgr->PopContext(); delete pResMgr; } @@ -1608,10 +1608,10 @@ namespace svxform ActivatePageHdl( &m_aTabCtrl ); // get our frame - DBG_ASSERT( pBindings != NULL, + DBG_ASSERT( pBindings != NULL, "DataNavigatorWindow::LoadModels(): no SfxBindings; can't get frame" ); - m_xFrame = Reference<XFrame>( - pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), + m_xFrame = Reference<XFrame>( + pBindings->GetDispatcher()->GetFrame()->GetFrame()->GetFrameInterface(), UNO_QUERY ); DBG_ASSERT( m_xFrame.is(), "DataNavigatorWindow::LoadModels(): no frame" ); // add frameaction listener @@ -3566,13 +3566,13 @@ namespace svxform } } - // #i36342# we need a temporary binding; create one if no existing binding + // #i36342# we need a temporary binding; create one if no existing binding // is found if( !m_xTempBinding.is() ) { - m_xCreatedBinding = m_xUIHelper->getBindingForNode( - Reference<css::xml::dom::XNode>( - xModel->getDefaultInstance()->getDocumentElement(), + m_xCreatedBinding = m_xUIHelper->getBindingForNode( + Reference<css::xml::dom::XNode>( + xModel->getDefaultInstance()->getDocumentElement(), UNO_QUERY_THROW ), sal_True ); m_xTempBinding = m_xCreatedBinding; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9c5ddf8280..c37eb0d5c4 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -64,7 +64,7 @@ #include <svx/fmshell.hxx> #include <fmshimp.hxx> #include <fmservs.hxx> -#include <fmtools.hxx> +#include <svx/fmtools.hxx> #include <cppuhelper/implbase1.hxx> #include <comphelper/property.hxx> #include <comphelper/uno3.hxx> diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx index 081540aa1b..bc11294a31 100644 --- a/svx/source/form/fmcontrollayout.cxx +++ b/svx/source/form/fmcontrollayout.cxx @@ -47,7 +47,8 @@ #include <comphelper/processfactory.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> + #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/fmctrler.cxx b/svx/source/form/fmctrler.cxx index 5f6c07ce7c..21b905566d 100644 --- a/svx/source/form/fmctrler.cxx +++ b/svx/source/form/fmctrler.cxx @@ -41,7 +41,7 @@ #include "fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmurl.hxx" #include "svx/dialmgr.hxx" #include "svx/fmshell.hxx" diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 55d92e07a0..e511a2e0ba 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include "fmexch.hxx" #include <sot/storage.hxx> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #ifndef _SVX_DBEXCH_HRC #include <dbexch.hrc> @@ -43,7 +43,7 @@ #include <tools/diagnose_ex.h> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> //........................................................................ namespace svxform diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index 558f23b2a8..106f081418 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> /** === end UNO includes === **/ #include <svx/fmmodel.hxx> -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include <tools/shl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index cbbeaae4c5..dac0daaf8f 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include <comphelper/stl_types.hxx> #include <svx/svdobj.hxx> -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmservs.hxx" #ifndef _FM_FMOBJFAC_HXX diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 6062e99859..691b141c40 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -78,7 +78,7 @@ #include "fmprop.hrc" #endif #include "fmundo.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" using namespace ::svxform; #endif #include <comphelper/property.hxx> diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 9da374d24d..d0b5a295de 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -34,7 +34,7 @@ #include "svxerr.hxx" #include "fmpgeimp.hxx" #include "fmundo.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmprop.hrc" #include "fmservs.hxx" #include "fmobj.hxx" diff --git a/svx/source/form/fmsearch.src b/svx/source/form/fmsearch.src deleted file mode 100644 index 63a175e04b..0000000000 --- a/svx/source/form/fmsearch.src +++ /dev/null @@ -1,333 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: fmsearch.src,v $ - * $Revision: 1.59 $ - * - * 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 "fmresids.hrc" -#include "fmsearch.hrc" -#include "fmhelp.hrc" - -ModalDialog RID_SVXDLG_SEARCHFORM -{ - OutputSize = TRUE; - SVLook = TRUE; - Size = MAP_APPFONT( 300, 253 ); - Text [ en-US ] = "Record Search"; - Moveable = TRUE; - HelpId = HID_FM_DLG_SEARCH; - - FixedLine FL_SEARCHFOR - { - Pos = MAP_APPFONT( 6, 8 ); - Size = MAP_APPFONT( 232, 8 ); - Text [ en-US ] = "Search for"; - }; - RadioButton RB_SEARCHFORTEXT - { - Pos = MAP_APPFONT( 12, 23 ); - Size = MAP_APPFONT( 50, 10 ); - Group = TRUE; - Text [ en-US ] = "~Text"; - }; - RadioButton RB_SEARCHFORNULL - { - Pos = MAP_APPFONT( 12, 36 ); - Size = MAP_APPFONT( 207, 10 ); - Text [ en-US ] = "Field content is ~NULL"; - }; - RadioButton RB_SEARCHFORNOTNULL - { - Pos = MAP_APPFONT( 12, 49 ); - Size = MAP_APPFONT( 207, 10 ); - Text [ en-US ] = "Field content is not NU~LL"; - }; - ComboBox CMB_SEARCHTEXT - { - Border = TRUE; - Pos = MAP_APPFONT( 65, 20 ); - Size = MAP_APPFONT( 154, 80 ); - DropDown = TRUE; - TabStop = TRUE; - HelpId = HID_SEARCH_TEXT; - }; - - FixedLine FL_WHERE - { - Pos = MAP_APPFONT( 6, 65 ); - Size = MAP_APPFONT( 232, 8 ); - Text [ en-US ] = "Where to search"; - }; - FixedText FT_FORM - { - Pos = MAP_APPFONT( 12, 77 ); - Size = MAP_APPFONT( 87, 10 ); - Text [ en-US ] = "Form"; - }; - ListBox LB_FORM - { - Border = TRUE; - Pos = MAP_APPFONT( 110, 76 ); - Size = MAP_APPFONT( 109, 60 ); - TabStop = TRUE; - DropDown = TRUE; - }; - RadioButton RB_ALLFIELDS - { - Pos = MAP_APPFONT( 24, 91 ); - Size = MAP_APPFONT( 75, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_ALLFIELDS; - Text [ en-US ] = "All Fields"; - }; - RadioButton RB_SINGLEFIELD - { - Pos = MAP_APPFONT( 24, 106 ); - Size = MAP_APPFONT( 75, 10 ); - Text [ en-US ] = "Single field"; - }; - ListBox LB_FIELD - { - Border = TRUE; - Pos = MAP_APPFONT( 110, 105 ); - Size = MAP_APPFONT( 109, 60 ); - TabStop = TRUE; - DropDown = TRUE; - HelpId = HID_SEARCH_FIELDSELECTION; - }; - FixedLine FL_OPTIONS - { - Pos = MAP_APPFONT( 6, 126 ); - Size = MAP_APPFONT( 288, 8 ); - Text [ en-US ] = "Settings"; - }; - FixedText FT_POSITION - { - Pos = MAP_APPFONT( 12, 138 ); - Size = MAP_APPFONT( 87, 8 ); - Text [ en-US ] = "Position"; - }; - ListBox LB_POSITION - { - Border = TRUE; - Pos = MAP_APPFONT( 110, 136 ); - Size = MAP_APPFONT( 109, 60 ); - TabStop = TRUE; - DropDown = TRUE; - HelpId = HID_SEARCH_POSITION; - }; - CheckBox CB_USEFORMATTER - { - Pos = MAP_APPFONT( 12, 158 ); - Size = MAP_APPFONT( 90, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_FORMATTER; - Text [ en-US ] = "Apply field format"; - }; - CheckBox CB_CASE - { - Pos = MAP_APPFONT( 12, 171 ); - Size = MAP_APPFONT( 90, 20 ); - TabStop = TRUE; - WordBreak = TRUE; - HelpId = HID_SEARCH_CASE; - Text [ en-US ] = "Match case"; - }; - CheckBox CB_BACKWARD - { - Pos = MAP_APPFONT( 105, 158 ); - Size = MAP_APPFONT( 85, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_BACKWARD; - Text [ en-US ] = "Search backwards"; - }; - CheckBox CB_STARTOVER - { - Pos = MAP_APPFONT( 105, 171 ); - Size = MAP_APPFONT( 85, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_STARTOVER; - Text [ en-US ] = "From Beginning"; - }; - CheckBox CB_WILDCARD - { - Pos = MAP_APPFONT( 190, 158 ); - Size = MAP_APPFONT( 100, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_WILDCARD; - Text [ en-US ] = "Wildcard expression"; - }; - CheckBox CB_REGULAR - { - Pos = MAP_APPFONT( 190, 171 ); - Size = MAP_APPFONT( 100, 10 ); - TabStop = TRUE; - HelpId = HID_SEARCH_REGULAR; - Text [ en-US ] = "Regular expression"; - }; - CheckBox CB_APPROX - { - Pos = MAP_APPFONT( 190, 184 ); - Size = MAP_APPFONT( 84, 20 ); - TabStop = TRUE; - WordBreak = TRUE; - HelpId = HID_SEARCH_APPROX; - Text [ en-US ] = "Similarity Search"; - }; - PushButton PB_APPROXSETTINGS - { - Pos = MAP_APPFONT( 275, 182 ); - Size = MAP_APPFONT( 14, 14 ); - TabStop = TRUE ; - HelpId = HID_SEARCH_APPROXSETTINGS; - Text [ en-US ] = "..."; - }; - CheckBox CB_HALFFULLFORMS - { - Pos = MAP_APPFONT( 105, 209 ); - Size = MAP_APPFONT( 85, 10 ); - TabStop = TRUE ; - Text [ en-US ] = "Match character width" ; - }; - CheckBox CB_SOUNDSLIKECJK - { - Pos = MAP_APPFONT( 190, 209 ); - Size = MAP_APPFONT( 84, 10 ); - TabStop = TRUE ; - Text [ en-US ] = "Sounds like (Japanese)"; - }; - PushButton PB_SOUNDSLIKESETTINGS - { - Pos = MAP_APPFONT( 275, 207 ); - Size = MAP_APPFONT( 14, 14 ); - TabStop = TRUE ; - Text [ en-US ] = "..." ; - }; - FixedLine FL_STATE - { - Pos = MAP_APPFONT( 6, 222 ); - Size = MAP_APPFONT( 288, 8 ); - Text [ en-US ] = "State"; - }; - FixedText FT_RECORDLABEL - { - Pos = MAP_APPFONT( 12, 232 ); - Size = MAP_APPFONT( 45, 10 ); - Text [ en-US ] = "Record :"; - }; - FixedText FT_RECORD - { - Pos = MAP_APPFONT( 60, 232 ); - Size = MAP_APPFONT( 30, 10 ); - UniqueId = UID_SEARCH_RECORDSTATUS; - }; - FixedText FT_HINT - { - Pos = MAP_APPFONT( 99, 232 ); - Size = MAP_APPFONT( 190, 10 ); - }; - PushButton PB_SEARCH - { - Pos = MAP_APPFONT( 244, 6 ); - Size = MAP_APPFONT( 50, 14 ); - TabStop = TRUE; - DefButton = TRUE; - HelpId = HID_SEARCH_BTN_SEARCH; - Text [ en-US ] = "Search"; - }; - CancelButton 1 - { - Pos = MAP_APPFONT( 244, 26 ); - Size = MAP_APPFONT( 50, 14 ); - HelpId = HID_SEARCH_BTN_CLOSE; - TabStop = TRUE; - Text [ en-US ] = "~Close"; - }; - HelpButton 1 - { - Pos = MAP_APPFONT( 244, 46 ); - Size = MAP_APPFONT( 50, 14 ); - TabStop = TRUE; - Text [ en-US ] = "~Help"; - }; -}; - -String RID_STR_SEARCH_ANYWHERE -{ - Text [ en-US ] = "anywhere in the field"; -}; - -String RID_STR_SEARCH_BEGINNING -{ - Text [ en-US ] = "beginning of field"; -}; - -String RID_STR_SEARCH_END -{ - Text [ en-US ] = "end of field"; -}; - -String RID_STR_SEARCH_WHOLE -{ - Text [ en-US ] = "entire field"; -}; - -String RID_STR_FROM_TOP -{ - Text [ en-US ] = "From top"; -}; -String RID_STR_FROM_BOTTOM -{ - Text [ en-US ] = "From bottom"; -}; - -ErrorBox RID_SVXERR_SEARCH_NORECORD -{ - Buttons = WB_OK; - Message [ en-US ] = "No records corresponding to your data found."; -}; - -ErrorBox RID_SVXERR_SEARCH_GENERAL_ERROR -{ - Buttons = WB_OK; - Message [ en-US ] = "An unknown error occurred. The search could not be finished."; -}; - -String RID_STR_OVERFLOW_FORWARD -{ - Text [ en-US ] = "Overflow, search continued at the beginning"; -}; - -String RID_STR_OVERFLOW_BACKWARD -{ - Text [ en-US ] = "Overflow, search continued at the end"; -}; - -String RID_STR_SEARCH_COUNTING -{ - Text [ en-US ] = "counting records"; -}; diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 7ae8d6a811..00ffaeef47 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include "fmvwimp.hxx" #include <svx/fmshell.hxx> -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmservs.hxx" #ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" @@ -56,11 +56,11 @@ #include <sfx2/viewfrm.hxx> #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <sfx2/app.hxx> -#include <svtools/intitem.hxx> -#include <svtools/visitem.hxx> -#include <svtools/moduleoptions.hxx> +#include <svl/intitem.hxx> +#include <svl/visitem.hxx> +#include <unotools/moduleoptions.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> @@ -79,7 +79,7 @@ #endif #include "fmexch.hxx" #include <svx/fmglob.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <tools/shl.hxx> #include <svx/svdpage.hxx> #include <svx/fmmodel.hxx> @@ -91,7 +91,7 @@ #include <vcl/sound.hxx> #include "fmexpl.hxx" #include "formcontrolling.hxx" -#include <svtools/numuno.hxx> +#include <svl/numuno.hxx> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> #include <comphelper/processfactory.hxx> @@ -795,7 +795,7 @@ void FmFormShell::Execute(SfxRequest &rReq) DBG_ASSERT( pFact, "no dialog factory!" ); if ( pFact ) { - ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL, RID_SVX_DLG_INPUTRECORDNO ) ); + ::std::auto_ptr< AbstractFmInputRecordNoDialog > dlg( pFact->CreateFmInputRecordNoDialog( NULL ) ); DBG_ASSERT( dlg.get(), "Dialogdiet fail!" ); dlg->SetValue( rController->getCursor()->getRow() ); if ( dlg->Execute() == RET_OK ) diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 801e3f613f..4b0c10e81d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -48,7 +48,7 @@ #include "svditer.hxx" #include "fmservs.hxx" #include "fmpgeimp.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #ifndef _SVX_FMPROP_HRC #include "fmprop.hrc" #endif @@ -3919,6 +3919,10 @@ void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& } } +void FmXFormShell::Commit() +{ +} + //------------------------------------------------------------------------ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem) { diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 58ad4d641e..c986ba991c 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "fmsrccfg.hxx" -#include <svtools/filerec.hxx> +#include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index 66acca4748..56e55cc127 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -34,7 +34,7 @@ #ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" #endif -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> @@ -69,11 +69,8 @@ #include "fmsrcimp.hxx" #include <svx/fmsearch.hxx> -#ifndef _FMSEARCH_HRC -#include "fmsearch.hrc" -#endif #include <comphelper/numbers.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #define EQUAL_BOOKMARKS(a, b) a == b diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index 15a843ee88..32a245120f 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -48,10 +48,10 @@ #endif #include "flagsdef.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> //........................................................................ namespace svx diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 0c7a416c4b..2506e05cca 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -66,12 +66,12 @@ #include <sfx2/request.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/viewfrm.hxx> -#include <svtools/eitem.hxx> -#include <svtools/intitem.hxx> -#include <svtools/itempool.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/itempool.hxx> +#include <svl/languageoptions.hxx> #include <svtools/stringtransfer.hxx> -#include <svtools/whiter.hxx> +#include <svl/whiter.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx index 6f3c9f5a75..84ebf215b1 100644 --- a/svx/source/form/fmtools.cxx +++ b/svx/source/form/fmtools.cxx @@ -36,7 +36,7 @@ #include <com/sun/star/sdb/XCompletedConnection.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/lang/Locale.hpp> -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "svx/dbtoolsclient.hxx" #include "fmservs.hxx" #include <svx/fmglob.hxx> @@ -91,8 +91,8 @@ #include "fmprop.hrc" #endif #include <sfx2/bindings.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <cppuhelper/servicefactory.hxx> #include <comphelper/types.hxx> #include <comphelper/property.hxx> diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 2fc7022f73..67fcd479e4 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -47,7 +47,7 @@ #ifndef _FM_FMMODEL_HXX #include <svx/fmmodel.hxx> #endif -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include <svx/fmpage.hxx> #ifndef _SVX_FMRESIDS_HRC #include "fmresids.hrc" @@ -56,7 +56,7 @@ #include <svx/dialmgr.hxx> #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> #include <tools/shl.hxx> #include <tools/diagnose_ex.h> #include <sfx2/objsh.hxx> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 26a5ecd7dd..fe907447e2 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,7 +35,7 @@ #undef REFERENCE #endif #include <svtools/ehdl.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/sdbc/XConnection.hpp> @@ -61,7 +61,7 @@ #include <svx/fmpage.hxx> #include <svx/fmshell.hxx> #include "fmpgeimp.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmprop.hrc" @@ -477,7 +477,7 @@ void FmFormView::InsertControlContainer(const Reference< ::com::sun::star::awt:: for( sal_uInt32 i = 0L; i < pPageView->PageWindowCount(); i++ ) { const SdrPageWindow& rPageWindow = *pPageView->GetPageWindow(i); - + if( rPageWindow.GetControlContainer( false ) == xCC ) { pImpl->addWindow(rPageWindow); @@ -517,15 +517,15 @@ BOOL FmFormView::KeyInput(const KeyEvent& rKEvt, Window* pWin) { BOOL bDone = FALSE; const KeyCode& rKeyCode = rKEvt.GetKeyCode(); - if ( IsDesignMode() + if ( IsDesignMode() && rKeyCode.GetCode() == KEY_RETURN ) { // RETURN alone enters grid controls, for keyboard accessibility - if ( pWin - && !rKeyCode.IsShift() - && !rKeyCode.IsMod1() - && !rKeyCode.IsMod2() + if ( pWin + && !rKeyCode.IsShift() + && !rKeyCode.IsMod1() + && !rKeyCode.IsMod2() ) { FmFormObj* pObj = getMarkedGrid(); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 4f088e4263..3f08ba47e0 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include "fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmundo.hxx" #include "fmvwimp.hxx" #include "formcontrolfactory.hxx" @@ -90,7 +90,7 @@ #include <comphelper/extract.hxx> #include <comphelper/numbers.hxx> #include <comphelper/property.hxx> -#include <svtools/moduleoptions.hxx> +#include <unotools/moduleoptions.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> #include <vcl/stdtext.hxx> @@ -1006,7 +1006,7 @@ void FmXFormView::onCreatedFormObject( FmFormObj& _rFormObject ) // it is valid that the form shell's forms collection is not initialized, yet pShellImpl->UpdateForms( sal_True ); - + m_xLastCreatedControlModel.set( _rFormObject.GetUnoControlModel(), UNO_QUERY ); if ( !m_xLastCreatedControlModel.is() ) return; diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index d3dba436b4..451354e905 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -56,7 +56,7 @@ #include <comphelper/componentcontext.hxx> #include <comphelper/numbers.hxx> -#include <svtools/syslocale.hxx> +#include <unotools/syslocale.hxx> #include <tools/gen.hxx> #include <tools/diagnose_ex.h> diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx index 69a2fb308e..63c42d4e9d 100644 --- a/svx/source/form/formcontrolling.cxx +++ b/svx/source/form/formcontrolling.cxx @@ -35,7 +35,7 @@ #include "fmurl.hxx" #include <svx/svxids.hrc> #include "fmprop.hrc" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" /** === begin UNO includes === **/ #include <com/sun/star/form/runtime/FormOperations.hpp> diff --git a/svx/source/form/makefile.mk b/svx/source/form/makefile.mk index b649be94d1..e5d8e15903 100644 --- a/svx/source/form/makefile.mk +++ b/svx/source/form/makefile.mk @@ -49,8 +49,6 @@ SRC1FILES= \ fmexpl.src \ filtnav.src \ fmstring.src \ - tbxform.src \ - fmsearch.src \ formshell.src \ datanavi.src diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 232a075ec3..678ca0f6b4 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -47,6 +47,7 @@ #include "fmpgeimp.hxx" #include "fmitems.hxx" #include "fmobj.hxx" +#include "fmprop.hrc" #include <vcl/wrkwin.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index d19e75f923..15f580a799 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -39,6 +39,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> +#include "fmprop.hrc" #include "fmundo.hxx" #include "fmhelp.hrc" diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx index 5c443c7437..ed43578cb9 100644 --- a/svx/source/form/sdbdatacolumn.cxx +++ b/svx/source/form/sdbdatacolumn.cxx @@ -149,17 +149,17 @@ namespace svxform return m_xColumn->getBytes(); } - Date DataColumn::getDate() throw( SQLException, RuntimeException ) + com::sun::star::util::Date DataColumn::getDate() throw( SQLException, RuntimeException ) { return m_xColumn->getDate(); } - Time DataColumn::getTime() throw( SQLException, RuntimeException ) + com::sun::star::util::Time DataColumn::getTime() throw( SQLException, RuntimeException ) { return m_xColumn->getTime(); } - DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException ) + com::sun::star::util::DateTime DataColumn::getTimestamp() throw( SQLException, RuntimeException ) { return m_xColumn->getTimestamp(); } @@ -255,12 +255,12 @@ namespace svxform m_xColumnUpdate->updateDate(x); } - void DataColumn::updateTime(const Time& x) throw( SQLException, RuntimeException ) + void DataColumn::updateTime(const com::sun::star::util::Time& x) throw( SQLException, RuntimeException ) { m_xColumnUpdate->updateTime(x); } - void DataColumn::updateTimestamp(const DateTime& x) throw( SQLException, RuntimeException ) + void DataColumn::updateTimestamp(const com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException ) { m_xColumnUpdate->updateTimestamp(x); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 0ad9062461..e280619a1a 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -32,7 +32,7 @@ #include "precompiled_svx.hxx" #include "tabwin.hxx" -#include "fmtools.hxx" +#include "svx/fmtools.hxx" #include "fmservs.hxx" #include "stringlistresource.hxx" diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 5025337118..dea9ec53e4 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -33,9 +33,9 @@ #include <string> // HACK: prevent conflict between STLPORT and Workshop headers #include <tools/ref.hxx> #include <tools/shl.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <sfx2/dispatch.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> diff --git a/svx/source/form/tbxform.src b/svx/source/form/tbxform.src deleted file mode 100644 index 0d52e8c4cb..0000000000 --- a/svx/source/form/tbxform.src +++ /dev/null @@ -1,69 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: tbxform.src,v $ - * $Revision: 1.31 $ - * - * 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 <svx/svxids.hrc> -#include "fmresids.hrc" -#include "helpid.hrc" - -ModalDialog RID_SVX_DLG_INPUTRECORDNO -{ - OutputSize = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 130 , 45 ) ; - Moveable = TRUE ; - Closeable = TRUE ; - Text [ en-US ] = "Record Number"; - - FixedText 1 - { - Pos = MAP_APPFONT ( 6 , 6 ) ; - Size = MAP_APPFONT ( 70 , 12 ) ; - Text [ en-US ] = "go to record"; - }; - NumericField 1 - { - Border = TRUE ; - Pos = MAP_APPFONT ( 79 , 6 ) ; - Size = MAP_APPFONT ( 45 , 12 ) ; - TabStop = TRUE ; - }; - OKButton 1 - { - Pos = MAP_APPFONT ( 6 , 25 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - DefButton = TRUE ; - }; - CancelButton 1 - { - Pos = MAP_APPFONT ( 74 , 25 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; - TabStop = TRUE ; - }; -}; diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index 0898dcdb2b..5a8baa8086 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -32,8 +32,8 @@ #include "precompiled_svx.hxx" #include <sfx2/objitem.hxx> #include <sfx2/msg.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svx/wghtitem.hxx> #include <svx/udlnitem.hxx> #include <svx/crsditem.hxx> |