diff options
Diffstat (limited to 'extensions/source/bibliography')
38 files changed, 956 insertions, 957 deletions
diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 319c58d509ad..eb6afcb44135 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,50 +30,50 @@ #include "bibliography.hrc" #ifndef RID_BIB_START -#define RID_BIB_START RID_EXTENSIONS_START +#define RID_BIB_START RID_EXTENSIONS_START #endif // ResIDs //Dialogs (100) -#define RID_BIB_DIALOG (RID_BIB_START) -#define RID_TP_GENERAL (RID_BIB_DIALOG) +#define RID_BIB_DIALOG (RID_BIB_START) +#define RID_TP_GENERAL (RID_BIB_DIALOG) #define RID_DLG_MAPPING (RID_BIB_DIALOG + 1) #define RID_DLG_DBCHANGE (RID_BIB_DIALOG + 2) //Controls(100) -#define RID_BIB_CONTROLS (RID_BIB_START + 100) -#define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1) +#define RID_BIB_CONTROLS (RID_BIB_START + 100) +#define RID_BIB_TOOLBAR (RID_BIB_CONTROLS+ 1) #define RID_TOOLBAR_IMGLIST (RID_BIB_CONTROLS+ 2) #define RID_TOOLBAR_IMGLIST_HC (RID_BIB_CONTROLS+ 3) #define RID_TOOLBAR_BIGIMGLIST (RID_BIB_CONTROLS+ 4) #define RID_TOOLBAR_BIGIMGLIST_HC (RID_BIB_CONTROLS+ 5) //Menu(100) -#define RID_BIB_MENU (RID_BIB_CONTROLS + 100) -#define RID_MAIN_MENU (RID_BIB_MENU +1) -//#define RID_MAIN_ME_HIERARCHICAL (RID_BIB_MENU +2) -#define RID_MAIN_ME_NEWENTRY (RID_BIB_MENU +3) -#define RID_MAIN_ME_CHANGEENTRY (RID_BIB_MENU +4) -#define RID_MAIN_ME_REMOVEENTRY (RID_BIB_MENU +5) -#define RID_MAIN_ME_SEARCH (RID_BIB_MENU +6) -#define RID_MAIN_ME_FIELDDLG (RID_BIB_MENU +7) -//#define RID_MAIN_ME_LAYOUT (RID_BIB_MENU +8) -#define RID_MAIN_ME_MAPPING (RID_BIB_MENU +9) -#define RID_MAIN_ME_DBSOURCE (RID_BIB_MENU +10) +#define RID_BIB_MENU (RID_BIB_CONTROLS + 100) +#define RID_MAIN_MENU (RID_BIB_MENU +1) +//#define RID_MAIN_ME_HIERARCHICAL (RID_BIB_MENU +2) +#define RID_MAIN_ME_NEWENTRY (RID_BIB_MENU +3) +#define RID_MAIN_ME_CHANGEENTRY (RID_BIB_MENU +4) +#define RID_MAIN_ME_REMOVEENTRY (RID_BIB_MENU +5) +#define RID_MAIN_ME_SEARCH (RID_BIB_MENU +6) +#define RID_MAIN_ME_FIELDDLG (RID_BIB_MENU +7) +//#define RID_MAIN_ME_LAYOUT (RID_BIB_MENU +8) +#define RID_MAIN_ME_MAPPING (RID_BIB_MENU +9) +#define RID_MAIN_ME_DBSOURCE (RID_BIB_MENU +10) #define RID_MAIN_DELETE_RECORD (RID_BIB_MENU +11) #define RID_MAIN_INSERT_RECORD (RID_BIB_MENU +12) -#define MN_TEMPLATES (RID_BIB_MENU +13) // to make makro ITEM_FILE_DOCTEMPLATE happy... +#define MN_TEMPLATES (RID_BIB_MENU +13) // to make makro ITEM_FILE_DOCTEMPLATE happy... -#define RID_POPUP_ME_VIEW (RID_BIB_MENU +50) +#define RID_POPUP_ME_VIEW (RID_BIB_MENU +50) // Strings (500) -#define RID_BIB_STRING (RID_BIB_START + 200) - // FREE (RID_BIB_STRING + 1) -#define RID_BIB_STR_FIELDSELECTION (RID_BIB_STRING + 2) -#define RID_BIB_STR_TABWIN_PREFIX (RID_BIB_STRING + 3) -#define RID_BIB_STR_FRAME_TITLE (RID_BIB_STRING + 4) -#define RID_MAP_QUESTION (RID_BIB_STRING + 5) +#define RID_BIB_STRING (RID_BIB_START + 200) + // FREE (RID_BIB_STRING + 1) +#define RID_BIB_STR_FIELDSELECTION (RID_BIB_STRING + 2) +#define RID_BIB_STR_TABWIN_PREFIX (RID_BIB_STRING + 3) +#define RID_BIB_STR_FRAME_TITLE (RID_BIB_STRING + 4) +#define RID_MAP_QUESTION (RID_BIB_STRING + 5) #define ST_IDENTIFIER (RID_BIB_STRING + 6) #define ST_AUTHTYPE (RID_BIB_STRING + 7) diff --git a/extensions/source/bibliography/bib.src b/extensions/source/bibliography/bib.src index 1ad6a7c83d17..1492de7b650a 100644 --- a/extensions/source/bibliography/bib.src +++ b/extensions/source/bibliography/bib.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index 6caac4f610d3..f6f7c93f0470 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,9 +53,9 @@ using namespace ::com::sun::star::uno; #define C2U(cChar) OUString::createFromAscii(cChar) -#define PROPERTY_FRAME 1 -#define ID_TOOLBAR 1 -#define ID_GRIDWIN 2 +#define PROPERTY_FRAME 1 +#define ID_TOOLBAR 1 +#define ID_GRIDWIN 2 //......................................................................... namespace bib @@ -66,14 +66,14 @@ namespace bib void HandleTaskPaneList( Window* pWindow, BOOL bAddToList ) { - Window* pParent = pWindow->GetParent(); + Window* pParent = pWindow->GetParent(); DBG_ASSERT( pParent, "-GetTaskPaneList(): everybody here should have a parent!" ); - SystemWindow* pSysWin = pParent->GetSystemWindow(); + SystemWindow* pSysWin = pParent->GetSystemWindow(); if( pSysWin ) { - TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList(); + TaskPaneList* pTaskPaneList = pSysWin->GetTaskPaneList(); if( pTaskPaneList ) { if( bAddToList ) @@ -91,16 +91,16 @@ namespace bib :public Window //DockingWindow { private: - Reference< awt::XWindow > m_xGridWin; - Reference< awt::XControlModel > m_xGridModel; - Reference< awt::XControl > m_xControl; - Reference< awt::XControlContainer > m_xControlContainer; + Reference< awt::XWindow > m_xGridWin; + Reference< awt::XControlModel > m_xGridModel; + Reference< awt::XControl > m_xControl; + Reference< awt::XControlContainer > m_xControlContainer; // #100312# --------- Reference< frame::XDispatchProviderInterception> m_xDispatchProviderInterception; - + protected: - virtual void Resize(); + virtual void Resize(); public: @@ -154,7 +154,7 @@ namespace bib if ( m_xGridModel.is() && xMgr.is()) { - uno::Reference< XPropertySet > xPropSet( m_xGridModel, UNO_QUERY ); + uno::Reference< XPropertySet > xPropSet( m_xGridModel, UNO_QUERY ); if ( xPropSet.is() && m_xGridModel.is() ) { @@ -289,7 +289,7 @@ namespace bib xReturn = pGridWin->getDispatchProviderInterception(); return xReturn; } - + //--------------------------------------------------------------------- void BibBeamer::SetXController(const uno::Reference< frame::XController > & xCtr) { @@ -316,7 +316,7 @@ namespace bib } //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibbeam.hxx b/extensions/source/bibliography/bibbeam.hxx index 68fc1fe38441..c9742b38baaa 100644 --- a/extensions/source/bibliography/bibbeam.hxx +++ b/extensions/source/bibliography/bibbeam.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,40 +55,40 @@ namespace bib { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xController; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xToolBarRef; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xGridRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xGridWin; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > m_xController; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xToolBarRef; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xGridRef; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xGridWin; - BibDataManager* pDatMan; - BibToolBar* pToolBar; - BibGridwin* pGridWin; + BibDataManager* pDatMan; + BibToolBar* pToolBar; + BibGridwin* pGridWin; DECL_LINK( RecalcLayout_Impl, void* ); protected: - void createToolBar(); - void createGridWin(); + void createToolBar(); + void createGridWin(); // FormControlContainer ---------- virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer(); public: // #100312# ------------------- - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception > getDispatchProviderInterception(); BibBeamer(Window* pParent,BibDataManager* pDatMan, WinBits nStyle = WB_3DLOOK ); ~BibBeamer(); - void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); + void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); - virtual void GetFocus(); + virtual void GetFocus(); }; //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... #endif diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 2ab99b35bf23..adf7ef75c276 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -189,7 +189,7 @@ BibConfig::BibConfig() : pAssignmentPropertyNames[nFieldIdx] = sSubPrefix; pAssignmentPropertyNames[nFieldIdx++] += C2U("/ProgrammaticFieldName"); pAssignmentPropertyNames[nFieldIdx] = sSubPrefix; - pAssignmentPropertyNames[nFieldIdx++] += C2U("/AssignedFieldName"); + pAssignmentPropertyNames[nFieldIdx++] += C2U("/AssignedFieldName"); } Sequence<Any> aAssignmentValues = GetProperties(aAssignmentPropertyNames); const Any* pAssignmentValues = aAssignmentValues.getConstArray(); @@ -225,7 +225,7 @@ BibConfig::~BibConfig() ---------------------------------------------------------------------------*/ BibDBDescriptor BibConfig::GetBibliographyURL() { - BibDBDescriptor aRet; + BibDBDescriptor aRet; aRet.sDataSource = sDataSource; aRet.sTableOrQuery = sTableOrQuery; aRet.nCommandType = nTblOrQuery; @@ -246,7 +246,7 @@ void BibConfig::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& ) { } -void BibConfig::Commit() +void BibConfig::Commit() { const Sequence<OUString> aPropertyNames = GetPropertyNames(); Sequence<Any> aValues(aPropertyNames.getLength()); @@ -285,13 +285,13 @@ void BibConfig::Commit() sPrefix += C2U("/_"); sPrefix += OUString::valueOf(i); sPrefix += C2U("/"); - pNodeValues[nIndex].Name = sPrefix; - pNodeValues[nIndex].Name += sName; + pNodeValues[nIndex].Name = sPrefix; + pNodeValues[nIndex].Name += sName; pNodeValues[nIndex++].Value <<= pMapping->sURL; - pNodeValues[nIndex].Name = sPrefix; + pNodeValues[nIndex].Name = sPrefix; pNodeValues[nIndex].Name += sTable; pNodeValues[nIndex++].Value <<= pMapping->sTableName; - pNodeValues[nIndex].Name = sPrefix; + pNodeValues[nIndex].Name = sPrefix; pNodeValues[nIndex].Name += sCommandType; pNodeValues[nIndex++].Value <<= pMapping->nCommandType; SetSetProperties( C2U(cDataSourceHistory), aNodeValues); @@ -310,11 +310,11 @@ void BibConfig::Commit() sSubPrefix += OUString::valueOf(nFieldAssignment); Sequence< PropertyValue > aAssignmentValues(2); PropertyValue* pAssignmentValues = aAssignmentValues.getArray(); - pAssignmentValues[0].Name = sSubPrefix; - pAssignmentValues[0].Name += sFieldName; + pAssignmentValues[0].Name = sSubPrefix; + pAssignmentValues[0].Name += sFieldName; pAssignmentValues[0].Value <<= pMapping->aColumnPairs[nFieldAssignment].sLogicalColumnName; - pAssignmentValues[1].Name = sSubPrefix; - pAssignmentValues[1].Name += sDatabaseFieldName; + pAssignmentValues[1].Name = sSubPrefix; + pAssignmentValues[1].Name += sDatabaseFieldName; pAssignmentValues[1].Value <<= pMapping->aColumnPairs[nFieldAssignment].sRealColumnName; SetSetProperties( sPrefix, aAssignmentValues ); nFieldAssignment++; @@ -324,7 +324,7 @@ void BibConfig::Commit() /* -----------------------------13.11.00 12:23-------------------------------- ---------------------------------------------------------------------------*/ -const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const +const Mapping* BibConfig::GetMapping(const BibDBDescriptor& rDesc) const { for(sal_uInt16 i = 0; i < pMappingsArr->Count(); i++) { diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index 093f0078b828..18af8fed5f46 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,9 +33,9 @@ class MappingArray; //----------------------------------------------------------------------------- -#define COLUMN_COUNT 31 -#define IDENTIFIER_POS 0 -#define AUTHORITYTYPE_POS 1 +#define COLUMN_COUNT 31 +#define IDENTIFIER_POS 0 +#define AUTHORITYTYPE_POS 1 #define AUTHOR_POS 2 #define TITLE_POS 3 #define YEAR_POS 4 @@ -68,16 +68,16 @@ class MappingArray; //----------------------------------------------------------------------------- struct StringPair { - rtl::OUString sRealColumnName; - rtl::OUString sLogicalColumnName; + rtl::OUString sRealColumnName; + rtl::OUString sLogicalColumnName; }; //----------------------------------------------------------------------------- struct Mapping { - rtl::OUString sTableName; - rtl::OUString sURL; - sal_Int16 nCommandType; - StringPair aColumnPairs[COLUMN_COUNT]; + rtl::OUString sTableName; + rtl::OUString sURL; + sal_Int16 nCommandType; + StringPair aColumnPairs[COLUMN_COUNT]; Mapping() : nCommandType(0){} @@ -85,55 +85,55 @@ struct Mapping //----------------------------------------------------------------------------- struct BibDBDescriptor { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; - sal_Int32 nCommandType; + rtl::OUString sDataSource; + rtl::OUString sTableOrQuery; + sal_Int32 nCommandType; }; //----------------------------------------------------------------------------- class BibConfig : public utl::ConfigItem { - rtl::OUString sDataSource; - rtl::OUString sTableOrQuery; - sal_Int32 nTblOrQuery; - - rtl::OUString sQueryField; - rtl::OUString sQueryText; - MappingArray* pMappingsArr; - long nBeamerSize; - long nViewSize; + rtl::OUString sDataSource; + rtl::OUString sTableOrQuery; + sal_Int32 nTblOrQuery; + + rtl::OUString sQueryField; + rtl::OUString sQueryText; + MappingArray* pMappingsArr; + long nBeamerSize; + long nViewSize; sal_Bool bShowColumnAssignmentWarning; - rtl::OUString aColumnDefaults[COLUMN_COUNT]; + rtl::OUString aColumnDefaults[COLUMN_COUNT]; com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); public: BibConfig(); ~BibConfig(); - virtual void Commit(); + virtual void Commit(); virtual void Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames); - BibDBDescriptor GetBibliographyURL(); - void SetBibliographyURL(const BibDBDescriptor& rDesc); + BibDBDescriptor GetBibliographyURL(); + void SetBibliographyURL(const BibDBDescriptor& rDesc); - const Mapping* GetMapping(const BibDBDescriptor& rDesc) const; - void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping); + const Mapping* GetMapping(const BibDBDescriptor& rDesc) const; + void SetMapping(const BibDBDescriptor& rDesc, const Mapping* pMapping); - const rtl::OUString& GetDefColumnName(sal_uInt16 nIndex) const + const rtl::OUString& GetDefColumnName(sal_uInt16 nIndex) const {return aColumnDefaults[nIndex];} - void setBeamerSize(long nSize) {SetModified(); nBeamerSize = nSize;} - long getBeamerSize()const {return nBeamerSize;} - void setViewSize(long nSize) {SetModified(); nViewSize = nSize;} - long getViewSize() {return nViewSize;} + void setBeamerSize(long nSize) {SetModified(); nBeamerSize = nSize;} + long getBeamerSize()const {return nBeamerSize;} + void setViewSize(long nSize) {SetModified(); nViewSize = nSize;} + long getViewSize() {return nViewSize;} - const rtl::OUString& getQueryField() const {return sQueryField;} - void setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;} + const rtl::OUString& getQueryField() const {return sQueryField;} + void setQueryField(const rtl::OUString& rSet) {SetModified(); sQueryField = rSet;} - const rtl::OUString& getQueryText() const {return sQueryText;} - void setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;} + const rtl::OUString& getQueryText() const {return sQueryText;} + void setQueryText(const rtl::OUString& rSet) {SetModified(); sQueryText = rSet;} sal_Bool IsShowColumnAssignmentWarning() const { return bShowColumnAssignmentWarning;} diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx index ac137f462d63..2c3e0f4d1e37 100644 --- a/extensions/source/bibliography/bibcont.cxx +++ b/extensions/source/bibliography/bibcont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ using namespace ::com::sun::star::frame; using namespace ::rtl; #define C2U(cChar) OUString::createFromAscii(cChar) -#define PROPERTY_FRAME 1 +#define PROPERTY_FRAME 1 //split window size is a percent value #define WIN_MIN_HEIGHT 10 #define WIN_STEP_SIZE 5 @@ -101,7 +101,7 @@ BibWindowContainer::BibWindowContainer( Window* pParent, BibShortCutHandler* pCh { if(pChild!=NULL) { - Window* pChildWindow = GetChild(); + Window* pChildWindow = GetChild(); pChildWindow->SetParent(this); pChildWindow->Show(); pChildWindow->SetPosPixel(Point(0,0)); @@ -113,7 +113,7 @@ BibWindowContainer::~BibWindowContainer() if( pChild ) { Window* pDel = GetChild(); - pChild = NULL; // prevents GetFocus for child while deleting! + pChild = NULL; // prevents GetFocus for child while deleting! delete pDel; } } @@ -158,14 +158,14 @@ BibBookContainer::~BibBookContainer() if( pTopWin ) { Window* pDel = pTopWin; - pTopWin = NULL; // prevents GetFocus for child while deleting! + pTopWin = NULL; // prevents GetFocus for child while deleting! delete pDel; } if( pBottomWin ) { Window* pDel = pBottomWin; - pBottomWin = NULL; // prevents GetFocus for child while deleting! + pBottomWin = NULL; // prevents GetFocus for child while deleting! delete pDel; } @@ -178,10 +178,10 @@ void BibBookContainer::Split() } IMPL_LINK( BibBookContainer, SplitHdl, Timer*,/*pT*/) { - long nSize= GetItemSize( TOP_WINDOW); + long nSize= GetItemSize( TOP_WINDOW); BibConfig* pConfig = BibModul::GetConfig(); pConfig->setBeamerSize(nSize); - nSize = GetItemSize( BOTTOM_WINDOW); + nSize = GetItemSize( BOTTOM_WINDOW); pConfig->setViewSize(nSize); return 0; } diff --git a/extensions/source/bibliography/bibcont.hxx b/extensions/source/bibliography/bibcont.hxx index be725ac5f713..54659be8ec08 100644 --- a/extensions/source/bibliography/bibcont.hxx +++ b/extensions/source/bibliography/bibcont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,29 +36,29 @@ #include "bibmod.hxx" -#define TOP_WINDOW 1 -#define BOTTOM_WINDOW 2 +#define TOP_WINDOW 1 +#define BOTTOM_WINDOW 2 class BibDataManager; -class BibWindowContainer : public BibWindow //Window +class BibWindowContainer : public BibWindow //Window { private: // !BibShortCutHandler is also always a Window! - BibShortCutHandler* pChild; + BibShortCutHandler* pChild; protected: - virtual void Resize(); + virtual void Resize(); public: BibWindowContainer( Window* pParent, BibShortCutHandler* pChild, WinBits nStyle = WB_3DLOOK); ~BibWindowContainer(); - inline Window* GetChild(); + inline Window* GetChild(); - virtual void GetFocus(); + virtual void GetFocus(); - virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled using Window::GetChild; }; @@ -73,24 +73,24 @@ class BibBookContainer: public BibSplitWindow { private: - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTopFrameRef; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xBottomFrameRef; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xTopFrameRef; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xBottomFrameRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xTopPeerRef; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xBottomPeerRef; - BibDataManager* pDatMan; - BibWindowContainer* pTopWin; - BibWindowContainer* pBottomWin; - sal_Bool bFirstTime; - HdlBibModul pBibMod; - Timer aTimer; + BibDataManager* pDatMan; + BibWindowContainer* pTopWin; + BibWindowContainer* pBottomWin; + sal_Bool bFirstTime; + HdlBibModul pBibMod; + Timer aTimer; DECL_LINK( SplitHdl, Timer*); protected: - virtual void Split(); + virtual void Split(); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -99,17 +99,17 @@ class BibBookContainer: public BibSplitWindow BibBookContainer(Window* pParent,BibDataManager*, WinBits nStyle = WB_3DLOOK ); ~BibBookContainer(); - inline BibWindow* GetTopWin() {return pTopWin;} - inline BibWindow* GetBottomWin() {return pBottomWin;} + inline BibWindow* GetTopWin() {return pTopWin;} + inline BibWindow* GetBottomWin() {return pBottomWin;} // !BibShortCutHandler is also always a Window! - void createTopFrame( BibShortCutHandler* pWin ); + void createTopFrame( BibShortCutHandler* pWin ); - void createBottomFrame( BibShortCutHandler* pWin ); + void createBottomFrame( BibShortCutHandler* pWin ); - virtual void GetFocus(); + virtual void GetFocus(); - virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual sal_Bool HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled }; #endif diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index db46e5d9f8d6..776f50a03067 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ #include <svl/urihelper.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/factory.hxx> // helper for factories +#include <cppuhelper/factory.hxx> // helper for factories #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdb/XColumn.hpp> @@ -90,37 +90,37 @@ using namespace ::com::sun::star::frame; //----------------------------------------------------------------------------- -#define PROPERTY_FRAME 1 +#define PROPERTY_FRAME 1 class BibliographyLoader : public cppu::WeakImplHelper4 < XServiceInfo, XNameAccess, XPropertySet, XFrameLoader > { - HdlBibModul m_pBibMod; - Reference< XLoadable > m_xDatMan; - BibDataManager* m_pDatMan; - Reference< XNameAccess > m_xColumns; - Reference< XResultSet > m_xCursor; + HdlBibModul m_pBibMod; + Reference< XLoadable > m_xDatMan; + BibDataManager* m_pDatMan; + Reference< XNameAccess > m_xColumns; + Reference< XResultSet > m_xCursor; private: - void loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + void loadView(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener); - BibDataManager* GetDataManager()const; - Reference< XNameAccess > GetDataColumns() const; - Reference< XResultSet > GetDataCursor() const; - Reference< sdb::XColumn > GetIdentifierColumn() const; + BibDataManager* GetDataManager()const; + Reference< XNameAccess > GetDataColumns() const; + Reference< XResultSet > GetDataCursor() const; + Reference< sdb::XColumn > GetIdentifierColumn() const; public: BibliographyLoader(); ~BibliographyLoader(); // XServiceInfo - rtl::OUString SAL_CALL getImplementationName() throw( ); - sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ); - Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); - static rtl::OUString getImplementationName_Static() throw( ) + rtl::OUString SAL_CALL getImplementationName() throw( ); + sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ); + Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ); + static rtl::OUString getImplementationName_Static() throw( ) { //! @@ -146,15 +146,15 @@ public: virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& PropertyName, const Reference< XVetoableChangeListener > & aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ); - static Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); + static Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames_Static(void) throw( ); - friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); + friend Reference< XInterface > SAL_CALL BibliographyLoader_CreateInstance( const Reference< XMultiServiceFactory > & rSMgr ) throw( Exception ); // XLoader - virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, + virtual void SAL_CALL load(const Reference< XFrame > & aFrame, const rtl::OUString& aURL, const Sequence< PropertyValue >& aArgs, const Reference< XLoadEventListener > & aListener) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL cancel(void) throw (::com::sun::star::uno::RuntimeException); }; BibliographyLoader::BibliographyLoader() : @@ -204,7 +204,7 @@ Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames(void) thr } // ORegistryServiceManager_Static -Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) +Sequence< rtl::OUString > BibliographyLoader::getSupportedServiceNames_Static(void) throw( ) { Sequence< rtl::OUString > aSNS( 2 ); aSNS.getArray()[0] = C2U("com.sun.star.frame.FrameLoader"); @@ -234,11 +234,11 @@ extern "C" //sKey += rtl::OUString::createFromAscii("/UNO/SERVICES"); - Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); + Reference< registry::XRegistryKey > xNewKey = xImplKey->createKey( C2U("/UNO/SERVICES") ); Sequence< rtl::OUString > aServices = BibliographyLoader::getSupportedServiceNames_Static(); for( INT32 i = 0; i < aServices.getLength(); i++ ) xNewKey->createKey( aServices.getConstArray()[i]); - xNewKey = xImplKey->createKey( C2U("/UNO/Loader")); + xNewKey = xImplKey->createKey( C2U("/UNO/Loader")); Reference< registry::XRegistryKey > xPatternKey = xImplKey->createKey( C2U("/Loader/Pattern" )); xPatternKey->setAsciiValue( C2U( ".component:Bibliography/*" ) ); @@ -327,16 +327,16 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: aURL.Complete = aMenuRes; Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); - Reference< util::XURLTransformer > xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY ); + Reference< util::XURLTransformer > xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY ); if( xTrans.is() ) { // Datei laden xTrans->parseStrict( aURL ); - Reference< XDispatchProvider > xProv( rFrame, UNO_QUERY ); + Reference< XDispatchProvider > xProv( rFrame, UNO_QUERY ); if ( xProv.is() ) { - Reference< XDispatch > aDisp = xProv->queryDispatch( aURL, C2U("_menubar"), 12 ); + Reference< XDispatch > aDisp = xProv->queryDispatch( aURL, C2U("_menubar"), 12 ); if ( aDisp.is() ) aDisp->dispatch( aURL, Sequence<PropertyValue>() ); } @@ -643,7 +643,7 @@ sal_Bool BibliographyLoader::hasByName(const rtl::OUString& rName) throw ( Runti Reference< XResultSet > xCursor = GetDataCursor(); Reference< sdb::XColumn > xIdColumn = GetIdentifierColumn(); - if (xIdColumn.is()) // implies xCursor.is() + if (xIdColumn.is()) // implies xCursor.is() { do { @@ -715,37 +715,37 @@ Any BibliographyLoader::getPropertyValue(const rtl::OUString& rPropertyName) Any aRet; static const sal_uInt16 aInternalMapping[] = { - IDENTIFIER_POS , // BibliographyDataField_IDENTIFIER - AUTHORITYTYPE_POS , // BibliographyDataField_BIBILIOGRAPHIC_TYPE - ADDRESS_POS , // BibliographyDataField_ADDRESS - ANNOTE_POS , // BibliographyDataField_ANNOTE - AUTHOR_POS , // BibliographyDataField_AUTHOR - BOOKTITLE_POS , // BibliographyDataField_BOOKTITLE - CHAPTER_POS , // BibliographyDataField_CHAPTER - EDITION_POS , // BibliographyDataField_EDITION - EDITOR_POS , // BibliographyDataField_EDITOR - HOWPUBLISHED_POS , // BibliographyDataField_HOWPUBLISHED - INSTITUTION_POS , // BibliographyDataField_INSTITUTION - JOURNAL_POS , // BibliographyDataField_JOURNAL - MONTH_POS , // BibliographyDataField_MONTH - NOTE_POS , // BibliographyDataField_NOTE - NUMBER_POS , // BibliographyDataField_NUMBER - ORGANIZATIONS_POS , // BibliographyDataField_ORGANIZATIONS - PAGES_POS , // BibliographyDataField_PAGES - PUBLISHER_POS , // BibliographyDataField_PUBLISHER - SCHOOL_POS , // BibliographyDataField_SCHOOL - SERIES_POS , // BibliographyDataField_SERIES - TITLE_POS , // BibliographyDataField_TITLE - REPORTTYPE_POS , // BibliographyDataField_REPORT_TYPE - VOLUME_POS , // BibliographyDataField_VOLUME - YEAR_POS , // BibliographyDataField_YEAR - URL_POS , // BibliographyDataField_URL - CUSTOM1_POS , // BibliographyDataField_CUSTOM1 - CUSTOM2_POS , // BibliographyDataField_CUSTOM2 - CUSTOM3_POS , // BibliographyDataField_CUSTOM3 - CUSTOM4_POS , // BibliographyDataField_CUSTOM4 - CUSTOM5_POS , // BibliographyDataField_CUSTOM5 - ISBN_POS //BibliographyDataField_ISBN + IDENTIFIER_POS , // BibliographyDataField_IDENTIFIER + AUTHORITYTYPE_POS , // BibliographyDataField_BIBILIOGRAPHIC_TYPE + ADDRESS_POS , // BibliographyDataField_ADDRESS + ANNOTE_POS , // BibliographyDataField_ANNOTE + AUTHOR_POS , // BibliographyDataField_AUTHOR + BOOKTITLE_POS , // BibliographyDataField_BOOKTITLE + CHAPTER_POS , // BibliographyDataField_CHAPTER + EDITION_POS , // BibliographyDataField_EDITION + EDITOR_POS , // BibliographyDataField_EDITOR + HOWPUBLISHED_POS , // BibliographyDataField_HOWPUBLISHED + INSTITUTION_POS , // BibliographyDataField_INSTITUTION + JOURNAL_POS , // BibliographyDataField_JOURNAL + MONTH_POS , // BibliographyDataField_MONTH + NOTE_POS , // BibliographyDataField_NOTE + NUMBER_POS , // BibliographyDataField_NUMBER + ORGANIZATIONS_POS , // BibliographyDataField_ORGANIZATIONS + PAGES_POS , // BibliographyDataField_PAGES + PUBLISHER_POS , // BibliographyDataField_PUBLISHER + SCHOOL_POS , // BibliographyDataField_SCHOOL + SERIES_POS , // BibliographyDataField_SERIES + TITLE_POS , // BibliographyDataField_TITLE + REPORTTYPE_POS , // BibliographyDataField_REPORT_TYPE + VOLUME_POS , // BibliographyDataField_VOLUME + YEAR_POS , // BibliographyDataField_YEAR + URL_POS , // BibliographyDataField_URL + CUSTOM1_POS , // BibliographyDataField_CUSTOM1 + CUSTOM2_POS , // BibliographyDataField_CUSTOM2 + CUSTOM3_POS , // BibliographyDataField_CUSTOM3 + CUSTOM4_POS , // BibliographyDataField_CUSTOM4 + CUSTOM5_POS , // BibliographyDataField_CUSTOM5 + ISBN_POS //BibliographyDataField_ISBN }; if(C2U("BibliographyDataFieldNames") == rPropertyName) { diff --git a/extensions/source/bibliography/bibmod.cxx b/extensions/source/bibliography/bibmod.cxx index 05d068b807af..a9809282d354 100644 --- a/extensions/source/bibliography/bibmod.cxx +++ b/extensions/source/bibliography/bibmod.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,7 +56,7 @@ using namespace ::com::sun::star::ucb; #define C2U(cChar) OUString::createFromAscii(cChar) #define C2S(cChar) String::CreateFromAscii(cChar) -HdlBibModul OpenBibModul() +HdlBibModul OpenBibModul() { if(pBibModul==NULL) { @@ -93,12 +93,12 @@ BibModul::~BibModul() pBibConfig = 0; } -BibDataManager* BibModul::createDataManager() +BibDataManager* BibModul::createDataManager() { return new BibDataManager(); } //----------------------------------------------------------------------------- -BibConfig* BibModul::GetConfig() +BibConfig* BibModul::GetConfig() { if(! pBibConfig) pBibConfig = new BibConfig; diff --git a/extensions/source/bibliography/bibmod.hxx b/extensions/source/bibliography/bibmod.hxx index 475d67937129..0e2f04854e14 100644 --- a/extensions/source/bibliography/bibmod.hxx +++ b/extensions/source/bibliography/bibmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,34 +34,34 @@ class ResMgr; class BibDataManager; class BibConfig; -#define BIBLIOGRAPHY_INI_GROUP "Bibliography" -#define BIBLIOGRAPHY_INI_CUR_NAME "BibliographyCurrent" -#define BIBLIOGRAPHY_INI_DB_ENTRY "Bibliography" +#define BIBLIOGRAPHY_INI_GROUP "Bibliography" +#define BIBLIOGRAPHY_INI_CUR_NAME "BibliographyCurrent" +#define BIBLIOGRAPHY_INI_DB_ENTRY "Bibliography" #define BIBLIOGRAPHY_INI_MAPPING "BibliographyFields" #define BIBLIOGRAPHY_TYPE_NAMES "BibliographyTypeNames" class BibModul { private: - ResMgr* pResMgr; - static BibConfig* pBibConfig; + ResMgr* pResMgr; + static BibConfig* pBibConfig; public: BibModul(); ~BibModul(); - ResMgr* GetResMgr(){return pResMgr;} - static BibConfig* GetConfig(); + ResMgr* GetResMgr(){return pResMgr;} + static BibConfig* GetConfig(); - BibDataManager* createDataManager(); + BibDataManager* createDataManager(); }; -typedef BibModul* PtrBibModul; -typedef PtrBibModul* HdlBibModul; +typedef BibModul* PtrBibModul; +typedef PtrBibModul* HdlBibModul; -HdlBibModul OpenBibModul(); -void CloseBibModul(HdlBibModul ppBibModul); +HdlBibModul OpenBibModul(); +void CloseBibModul(HdlBibModul ppBibModul); #endif diff --git a/extensions/source/bibliography/bibprop.hrc b/extensions/source/bibliography/bibprop.hrc index 42767a2c01b1..0f24597eee7a 100644 --- a/extensions/source/bibliography/bibprop.hrc +++ b/extensions/source/bibliography/bibprop.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/extensions/source/bibliography/bibresid.hxx b/extensions/source/bibliography/bibresid.hxx index de8c6c0a0769..724dec0c3673 100644 --- a/extensions/source/bibliography/bibresid.hxx +++ b/extensions/source/bibliography/bibresid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx index f0bf5aa574b0..88fe8b18a532 100644 --- a/extensions/source/bibliography/bibshortcuthandler.hxx +++ b/extensions/source/bibliography/bibshortcuthandler.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,16 +40,16 @@ class BibShortCutHandler { private: - Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window + Window* pBaseClass; // in cases, where BibShortCutHandler also has to be a window protected: - inline BibShortCutHandler( Window* pBaseClass ); + inline BibShortCutHandler( Window* pBaseClass ); public: - virtual ~BibShortCutHandler(); - virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual ~BibShortCutHandler(); + virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled - inline Window* GetWindow( void ); + inline Window* GetWindow( void ); }; inline BibShortCutHandler::BibShortCutHandler( Window* _pBaseClass ) : pBaseClass( _pBaseClass ) @@ -66,7 +66,7 @@ class BibWindow : public Window, public BibShortCutHandler { public: BibWindow( Window* pParent,WinBits nStyle = WB_3DLOOK); - virtual ~BibWindow(); + virtual ~BibWindow(); }; @@ -74,7 +74,7 @@ class BibSplitWindow : public SplitWindow, public BibShortCutHandler { public: BibSplitWindow( Window* pParent,WinBits nStyle = WB_3DLOOK); - virtual ~BibSplitWindow(); + virtual ~BibSplitWindow(); }; @@ -82,7 +82,7 @@ class BibTabPage : public TabPage, public BibShortCutHandler { public: BibTabPage( Window* pParent, const ResId& rResId ); - virtual ~BibTabPage(); + virtual ~BibTabPage(); }; #endif diff --git a/extensions/source/bibliography/bibtools.hxx b/extensions/source/bibliography/bibtools.hxx index 91dd5648ce63..d62a5bce7528 100644 --- a/extensions/source/bibliography/bibtools.hxx +++ b/extensions/source/bibliography/bibtools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #ifndef BIBTOOLS_HXX -#include <vcl/taskpanelist.hxx> // includes also vcl/window.hxx +#include <vcl/taskpanelist.hxx> // includes also vcl/window.hxx namespace bib { diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index abf2d293ba82..44c94cb1a317 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,8 +102,8 @@ namespace bib } catch( const uno::Exception& rEx) { - (void) rEx; - } + (void) rEx; + } } } @@ -227,7 +227,7 @@ namespace bib } //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/bibview.hxx b/extensions/source/bibliography/bibview.hxx index f4fa44ea7b17..0f86069a554a 100644 --- a/extensions/source/bibliography/bibview.hxx +++ b/extensions/source/bibliography/bibview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include "formcontrolcontainer.hxx" #include "bibshortcuthandler.hxx" -class BibGeneralPage; -class BibDataManager; +class BibGeneralPage; +class BibDataManager; namespace com{ namespace sun{ namespace star{ namespace awt{ class XFocusListener;}}}} @@ -47,39 +47,39 @@ namespace bib class BibView : public BibWindow, public FormControlContainer { private: - BibDataManager* m_pDatMan; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable> m_xDatMan; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener> m_xGeneralPage; - BibGeneralPage* m_pGeneralPage; + BibDataManager* m_pDatMan; + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable> m_xDatMan; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFocusListener> m_xGeneralPage; + BibGeneralPage* m_pGeneralPage; private: DECL_STATIC_LINK(BibView, CallMappingHdl, BibView*); protected: // Window overridables - virtual void Resize(); + virtual void Resize(); // FormControlContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer(); // XLoadListener equivalents - virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ); - virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ); + virtual void _loaded( const ::com::sun::star::lang::EventObject& _rEvent ); + virtual void _reloaded( const ::com::sun::star::lang::EventObject& _rEvent ); public: BibView( Window* _pParent, BibDataManager* _pDatMan, WinBits nStyle = WB_3DLOOK ); ~BibView(); - void UpdatePages(); + void UpdatePages(); - virtual void GetFocus(); + virtual void GetFocus(); - virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled }; //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... #endif diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index fa9775377896..1290431f760c 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -112,7 +112,7 @@ using namespace ::ucb; Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) { // first get the sdb::DataSource corresponding to the url - Reference< XDataSource > xDataSource; + Reference< XDataSource > xDataSource; // is it a favorite title ? Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); Reference<XInterface> xNamingContextIfc = xMgr->createInstance(C2U("com.sun.star.sdb.DatabaseContext")); @@ -126,19 +126,19 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) } catch(Exception eEx) { - (void) eEx; // make compiler happy + (void) eEx; // make compiler happy DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()"); } } // build the connection from the data source - Reference< XConnection > xConn; + Reference< XConnection > xConn; if (xDataSource.is()) { // need user/pwd for this ::rtl::OUString sUser, sPwd; Reference< XPropertySet > xDataSourceProps(xDataSource, UNO_QUERY); Reference< XCompletedConnection > xComplConn(xDataSource, UNO_QUERY); -/* Reference< XPropertySetInfo > xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > (); +/* Reference< XPropertySetInfo > xInfo = xDataSourceProps.is() ? xDataSourceProps->getPropertySetInfo() : Reference< XPropertySetInfo > (); if (xInfo.is() && xInfo->hasPropertyByName(C2U("User"))) xDataSourceProps->getPropertyValue(C2U("User")) >>= sUser; if (xInfo.is() && xInfo->hasPropertyByName(C2U("Password"))) @@ -150,7 +150,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) Reference<XInterface> xHdl = xMgr->createInstance(C2U("com.sun.star.task.InteractionHandler")); Reference<task::XInteractionHandler> xIHdl(xHdl, UNO_QUERY); xConn = xComplConn->connectWithCompletion(xIHdl); -// xConn = xDataSource->getConnection(sUser, sPwd); +// xConn = xDataSource->getConnection(sUser, sPwd); } catch(SQLException&) { @@ -158,7 +158,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy } } @@ -168,9 +168,9 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL) /* -----------------17.01.00 14:46------------------- --------------------------------------------------*/ -Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) +Reference< XConnection > getConnection(const Reference< XInterface > & xRowSet) { - Reference< XConnection > xConn; + Reference< XConnection > xConn; try { Reference< XPropertySet > xFormProps(xRowSet, UNO_QUERY); @@ -185,7 +185,7 @@ Reference< XConnection > getConnection(const Reference< XInterface > & xRowSe } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("exception in getConnection"); } @@ -203,7 +203,7 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) xReturn = xSupplyCols->getColumns(); if (!xReturn.is() || (xReturn->getElementNames().getLength() == 0)) - { // no .... + { // no .... xReturn = NULL; // -> get the table the form is bound to and ask it for their columns Reference< XTablesSupplier > xSupplyTables( getConnection( _rxForm ), UNO_QUERY ); @@ -248,78 +248,78 @@ Reference< XNameAccess > getColumns(const Reference< XForm > & _rxForm) class MappingDialog_Impl : public ModalDialog { BibDataManager* pDatMan; - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - FixedLine aMapGB; - FixedText aIdentifierFT; - ListBox aIdentifierLB; - FixedText aAuthorityTypeFT; - ListBox aAuthorityTypeLB; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + FixedLine aMapGB; + FixedText aIdentifierFT; + ListBox aIdentifierLB; + FixedText aAuthorityTypeFT; + ListBox aAuthorityTypeLB; FixedText aAuthorFT; - ListBox aAuthorLB; - FixedText aTitleFT; - ListBox aTitleLB; + ListBox aAuthorLB; + FixedText aTitleFT; + ListBox aTitleLB; FixedText aMonthFT; - ListBox aMonthLB; + ListBox aMonthLB; FixedText aYearFT; - ListBox aYearLB; + ListBox aYearLB; FixedText aISBNFT; - ListBox aISBNLB; + ListBox aISBNLB; FixedText aBooktitleFT; - ListBox aBooktitleLB; + ListBox aBooktitleLB; FixedText aChapterFT; - ListBox aChapterLB; + ListBox aChapterLB; FixedText aEditionFT; - ListBox aEditionLB; + ListBox aEditionLB; FixedText aEditorFT; - ListBox aEditorLB; + ListBox aEditorLB; FixedText aHowpublishedFT; - ListBox aHowpublishedLB; + ListBox aHowpublishedLB; FixedText aInstitutionFT; - ListBox aInstitutionLB; + ListBox aInstitutionLB; FixedText aJournalFT; - ListBox aJournalLB; + ListBox aJournalLB; FixedText aNoteFT; - ListBox aNoteLB; + ListBox aNoteLB; FixedText aAnnoteFT; - ListBox aAnnoteLB; + ListBox aAnnoteLB; FixedText aNumberFT; - ListBox aNumberLB; + ListBox aNumberLB; FixedText aOrganizationsFT; - ListBox aOrganizationsLB; + ListBox aOrganizationsLB; FixedText aPagesFT; - ListBox aPagesLB; + ListBox aPagesLB; FixedText aPublisherFT; - ListBox aPublisherLB; + ListBox aPublisherLB; FixedText aAddressFT; - ListBox aAddressLB; + ListBox aAddressLB; FixedText aSchoolFT; - ListBox aSchoolLB; + ListBox aSchoolLB; FixedText aSeriesFT; - ListBox aSeriesLB; + ListBox aSeriesLB; FixedText aReportTypeFT; - ListBox aReportTypeLB; + ListBox aReportTypeLB; FixedText aVolumeFT; - ListBox aVolumeLB; + ListBox aVolumeLB; FixedText aURLFT; - ListBox aURLLB; + ListBox aURLLB; FixedText aCustom1FT; - ListBox aCustom1LB; - FixedText aCustom2FT; - ListBox aCustom2LB; - FixedText aCustom3FT; - ListBox aCustom3LB; - FixedText aCustom4FT; - ListBox aCustom4LB; - FixedText aCustom5FT; - ListBox aCustom5LB; - ListBox* aListBoxes[COLUMN_COUNT]; - String sNone; - - sal_Bool bModified; - - + ListBox aCustom1LB; + FixedText aCustom2FT; + ListBox aCustom2LB; + FixedText aCustom3FT; + ListBox aCustom3LB; + FixedText aCustom4FT; + ListBox aCustom4LB; + FixedText aCustom5FT; + ListBox aCustom5LB; + ListBox* aListBoxes[COLUMN_COUNT]; + String sNone; + + sal_Bool bModified; + + DECL_LINK(OkHdl, OKButton*); DECL_LINK(ListBoxSelectHdl, ListBox*); @@ -328,7 +328,7 @@ public: MappingDialog_Impl(Window* pParent, BibDataManager* pDatMan); ~MappingDialog_Impl(); - void SetModified() {bModified = TRUE;} + void SetModified() {bModified = TRUE;} }; /* -----------------11.11.99 16:42------------------- @@ -348,110 +348,110 @@ sal_uInt16 lcl_FindLogicalName(BibConfig* pConfig , MappingDialog_Impl::MappingDialog_Impl(Window* pParent, BibDataManager* pMan) : ModalDialog(pParent, BibResId(RID_DLG_MAPPING) ), pDatMan(pMan), - aOKBT(this, BibResId( BT_OK )), - aCancelBT(this, BibResId( BT_CANCEL )), - aHelpBT(this, BibResId( BT_HELP )), - - aMapGB(this, BibResId( GB_MAPPING )), - - aIdentifierFT(this, BibResId( FT_IDENTIFIER )), - aIdentifierLB(this, BibResId( LB_IDENTIFIER )), - aAuthorityTypeFT(this, BibResId( FT_AUTHORITYTYPE )), - aAuthorityTypeLB(this, BibResId( LB_AUTHORITYTYPE )), - aAuthorFT(this, BibResId( FT_AUTHOR )), - aAuthorLB(this, BibResId( LB_AUTHOR )), - aTitleFT(this, BibResId( FT_TITLE )), - aTitleLB(this, BibResId( LB_TITLE )), - aMonthFT(this, BibResId( FT_MONTH )), - aMonthLB(this, BibResId( LB_MONTH )), - aYearFT(this, BibResId( FT_YEAR )), - aYearLB(this, BibResId( LB_YEAR )), - aISBNFT(this, BibResId( FT_ISBN )), - aISBNLB(this, BibResId( LB_ISBN )), - aBooktitleFT(this, BibResId( FT_BOOKTITLE )), - aBooktitleLB(this, BibResId( LB_BOOKTITLE )), - aChapterFT(this, BibResId( FT_CHAPTER )), - aChapterLB(this, BibResId( LB_CHAPTER )), - aEditionFT(this, BibResId( FT_EDITION )), - aEditionLB(this, BibResId( LB_EDITION )), - aEditorFT(this, BibResId( FT_EDITOR )), - aEditorLB(this, BibResId( LB_EDITOR )), - aHowpublishedFT(this, BibResId( FT_HOWPUBLISHED )), - aHowpublishedLB(this, BibResId( LB_HOWPUBLISHED )), - aInstitutionFT(this, BibResId( FT_INSTITUTION )), - aInstitutionLB(this, BibResId( LB_INSTITUTION )), - aJournalFT(this, BibResId( FT_JOURNAL )), - aJournalLB(this, BibResId( LB_JOURNAL )), - aNoteFT(this, BibResId( FT_NOTE )), - aNoteLB(this, BibResId( LB_NOTE )), - aAnnoteFT(this, BibResId( FT_ANNOTE )), - aAnnoteLB(this, BibResId( LB_ANNOTE )), - aNumberFT(this, BibResId( FT_NUMBER )), - aNumberLB(this, BibResId( LB_NUMBER )), - aOrganizationsFT(this, BibResId( FT_ORGANIZATIONS )), - aOrganizationsLB(this, BibResId( LB_ORGANIZATIONS )), - aPagesFT(this, BibResId( FT_PAGES )), - aPagesLB(this, BibResId( LB_PAGES )), - aPublisherFT(this, BibResId( FT_PUBLISHER )), - aPublisherLB(this, BibResId( LB_PUBLISHER )), - aAddressFT(this, BibResId( FT_ADDRESS )), - aAddressLB(this, BibResId( LB_ADDRESS )), - aSchoolFT(this, BibResId( FT_SCHOOL )), - aSchoolLB(this, BibResId( LB_SCHOOL )), - aSeriesFT(this, BibResId( FT_SERIES )), - aSeriesLB(this, BibResId( LB_SERIES )), - aReportTypeFT(this, BibResId( FT_REPORTTYPE )), - aReportTypeLB(this, BibResId( LB_REPORTTYPE )), - aVolumeFT(this, BibResId( FT_VOLUME )), - aVolumeLB(this, BibResId( LB_VOLUME )), - aURLFT(this, BibResId( FT_URL )), - aURLLB(this, BibResId( LB_URL )), - aCustom1FT(this, BibResId( FT_CUSTOM1 )), - aCustom1LB(this, BibResId( LB_CUSTOM1 )), - aCustom2FT(this, BibResId( FT_CUSTOM2 )), - aCustom2LB(this, BibResId( LB_CUSTOM2 )), - aCustom3FT(this, BibResId( FT_CUSTOM3 )), - aCustom3LB(this, BibResId( LB_CUSTOM3 )), - aCustom4FT(this, BibResId( FT_CUSTOM4 )), - aCustom4LB(this, BibResId( LB_CUSTOM4 )), - aCustom5FT(this, BibResId( FT_CUSTOM5 )), - aCustom5LB(this, BibResId( LB_CUSTOM5 )), + aOKBT(this, BibResId( BT_OK )), + aCancelBT(this, BibResId( BT_CANCEL )), + aHelpBT(this, BibResId( BT_HELP )), + + aMapGB(this, BibResId( GB_MAPPING )), + + aIdentifierFT(this, BibResId( FT_IDENTIFIER )), + aIdentifierLB(this, BibResId( LB_IDENTIFIER )), + aAuthorityTypeFT(this, BibResId( FT_AUTHORITYTYPE )), + aAuthorityTypeLB(this, BibResId( LB_AUTHORITYTYPE )), + aAuthorFT(this, BibResId( FT_AUTHOR )), + aAuthorLB(this, BibResId( LB_AUTHOR )), + aTitleFT(this, BibResId( FT_TITLE )), + aTitleLB(this, BibResId( LB_TITLE )), + aMonthFT(this, BibResId( FT_MONTH )), + aMonthLB(this, BibResId( LB_MONTH )), + aYearFT(this, BibResId( FT_YEAR )), + aYearLB(this, BibResId( LB_YEAR )), + aISBNFT(this, BibResId( FT_ISBN )), + aISBNLB(this, BibResId( LB_ISBN )), + aBooktitleFT(this, BibResId( FT_BOOKTITLE )), + aBooktitleLB(this, BibResId( LB_BOOKTITLE )), + aChapterFT(this, BibResId( FT_CHAPTER )), + aChapterLB(this, BibResId( LB_CHAPTER )), + aEditionFT(this, BibResId( FT_EDITION )), + aEditionLB(this, BibResId( LB_EDITION )), + aEditorFT(this, BibResId( FT_EDITOR )), + aEditorLB(this, BibResId( LB_EDITOR )), + aHowpublishedFT(this, BibResId( FT_HOWPUBLISHED )), + aHowpublishedLB(this, BibResId( LB_HOWPUBLISHED )), + aInstitutionFT(this, BibResId( FT_INSTITUTION )), + aInstitutionLB(this, BibResId( LB_INSTITUTION )), + aJournalFT(this, BibResId( FT_JOURNAL )), + aJournalLB(this, BibResId( LB_JOURNAL )), + aNoteFT(this, BibResId( FT_NOTE )), + aNoteLB(this, BibResId( LB_NOTE )), + aAnnoteFT(this, BibResId( FT_ANNOTE )), + aAnnoteLB(this, BibResId( LB_ANNOTE )), + aNumberFT(this, BibResId( FT_NUMBER )), + aNumberLB(this, BibResId( LB_NUMBER )), + aOrganizationsFT(this, BibResId( FT_ORGANIZATIONS )), + aOrganizationsLB(this, BibResId( LB_ORGANIZATIONS )), + aPagesFT(this, BibResId( FT_PAGES )), + aPagesLB(this, BibResId( LB_PAGES )), + aPublisherFT(this, BibResId( FT_PUBLISHER )), + aPublisherLB(this, BibResId( LB_PUBLISHER )), + aAddressFT(this, BibResId( FT_ADDRESS )), + aAddressLB(this, BibResId( LB_ADDRESS )), + aSchoolFT(this, BibResId( FT_SCHOOL )), + aSchoolLB(this, BibResId( LB_SCHOOL )), + aSeriesFT(this, BibResId( FT_SERIES )), + aSeriesLB(this, BibResId( LB_SERIES )), + aReportTypeFT(this, BibResId( FT_REPORTTYPE )), + aReportTypeLB(this, BibResId( LB_REPORTTYPE )), + aVolumeFT(this, BibResId( FT_VOLUME )), + aVolumeLB(this, BibResId( LB_VOLUME )), + aURLFT(this, BibResId( FT_URL )), + aURLLB(this, BibResId( LB_URL )), + aCustom1FT(this, BibResId( FT_CUSTOM1 )), + aCustom1LB(this, BibResId( LB_CUSTOM1 )), + aCustom2FT(this, BibResId( FT_CUSTOM2 )), + aCustom2LB(this, BibResId( LB_CUSTOM2 )), + aCustom3FT(this, BibResId( FT_CUSTOM3 )), + aCustom3LB(this, BibResId( LB_CUSTOM3 )), + aCustom4FT(this, BibResId( FT_CUSTOM4 )), + aCustom4LB(this, BibResId( LB_CUSTOM4 )), + aCustom5FT(this, BibResId( FT_CUSTOM5 )), + aCustom5LB(this, BibResId( LB_CUSTOM5 )), sNone(BibResId(ST_NONE)), bModified(sal_False) { FreeResource(); - aIdentifierFT.SetText(String( BibResId( ST_IDENTIFIER ))); - aAuthorityTypeFT.SetText(String( BibResId( ST_AUTHTYPE ))); - aAuthorFT.SetText(String( BibResId( ST_AUTHOR ))); - aTitleFT.SetText(String( BibResId( ST_TITLE ))); - aMonthFT.SetText(String( BibResId( ST_MONTH ))); - aYearFT.SetText(String( BibResId( ST_YEAR ))); - aISBNFT.SetText(String( BibResId( ST_ISBN ))); - aBooktitleFT.SetText(String( BibResId( ST_BOOKTITLE ))); - aChapterFT.SetText(String( BibResId( ST_CHAPTER ))); - aEditionFT.SetText(String( BibResId( ST_EDITION ))); - aEditorFT.SetText(String( BibResId( ST_EDITOR ))); - aHowpublishedFT.SetText(String( BibResId( ST_HOWPUBLISHED ))); - aInstitutionFT.SetText(String( BibResId( ST_INSTITUTION ))); - aJournalFT.SetText(String( BibResId( ST_JOURNAL ))); - aNoteFT.SetText(String( BibResId( ST_NOTE ))); - aAnnoteFT.SetText(String( BibResId( ST_ANNOTE ))); - aNumberFT.SetText(String( BibResId( ST_NUMBER ))); - aOrganizationsFT.SetText(String( BibResId( ST_ORGANIZATION ))); - aPagesFT.SetText(String( BibResId( ST_PAGE ))); - aPublisherFT.SetText(String( BibResId( ST_PUBLISHER ))); - aAddressFT.SetText(String( BibResId( ST_ADDRESS ))); - aSchoolFT.SetText(String( BibResId( ST_SCHOOL ))); - aSeriesFT.SetText(String( BibResId( ST_SERIES ))); - aReportTypeFT.SetText(String( BibResId( ST_REPORT ))); - aVolumeFT.SetText(String( BibResId( ST_VOLUME ))); - aURLFT.SetText(String( BibResId( ST_URL ))); - aCustom1FT.SetText(String( BibResId( ST_CUSTOM1 ))); - aCustom2FT.SetText(String( BibResId( ST_CUSTOM2 ))); - aCustom3FT.SetText(String( BibResId( ST_CUSTOM3 ))); - aCustom4FT.SetText(String( BibResId( ST_CUSTOM4 ))); - aCustom5FT.SetText(String( BibResId( ST_CUSTOM5 ))); + aIdentifierFT.SetText(String( BibResId( ST_IDENTIFIER ))); + aAuthorityTypeFT.SetText(String( BibResId( ST_AUTHTYPE ))); + aAuthorFT.SetText(String( BibResId( ST_AUTHOR ))); + aTitleFT.SetText(String( BibResId( ST_TITLE ))); + aMonthFT.SetText(String( BibResId( ST_MONTH ))); + aYearFT.SetText(String( BibResId( ST_YEAR ))); + aISBNFT.SetText(String( BibResId( ST_ISBN ))); + aBooktitleFT.SetText(String( BibResId( ST_BOOKTITLE ))); + aChapterFT.SetText(String( BibResId( ST_CHAPTER ))); + aEditionFT.SetText(String( BibResId( ST_EDITION ))); + aEditorFT.SetText(String( BibResId( ST_EDITOR ))); + aHowpublishedFT.SetText(String( BibResId( ST_HOWPUBLISHED ))); + aInstitutionFT.SetText(String( BibResId( ST_INSTITUTION ))); + aJournalFT.SetText(String( BibResId( ST_JOURNAL ))); + aNoteFT.SetText(String( BibResId( ST_NOTE ))); + aAnnoteFT.SetText(String( BibResId( ST_ANNOTE ))); + aNumberFT.SetText(String( BibResId( ST_NUMBER ))); + aOrganizationsFT.SetText(String( BibResId( ST_ORGANIZATION ))); + aPagesFT.SetText(String( BibResId( ST_PAGE ))); + aPublisherFT.SetText(String( BibResId( ST_PUBLISHER ))); + aAddressFT.SetText(String( BibResId( ST_ADDRESS ))); + aSchoolFT.SetText(String( BibResId( ST_SCHOOL ))); + aSeriesFT.SetText(String( BibResId( ST_SERIES ))); + aReportTypeFT.SetText(String( BibResId( ST_REPORT ))); + aVolumeFT.SetText(String( BibResId( ST_VOLUME ))); + aURLFT.SetText(String( BibResId( ST_URL ))); + aCustom1FT.SetText(String( BibResId( ST_CUSTOM1 ))); + aCustom2FT.SetText(String( BibResId( ST_CUSTOM2 ))); + aCustom3FT.SetText(String( BibResId( ST_CUSTOM3 ))); + aCustom4FT.SetText(String( BibResId( ST_CUSTOM4 ))); + aCustom5FT.SetText(String( BibResId( ST_CUSTOM5 ))); aOKBT.SetClickHdl(LINK(this, MappingDialog_Impl, OkHdl)); String sTitle = GetText(); @@ -592,25 +592,25 @@ IMPL_LINK(MappingDialog_Impl, OkHdl, OKButton*, EMPTYARG) --------------------------------------------------*/ class DBChangeDialog_Impl : public ModalDialog { - OKButton aOKBT; - CancelButton aCancelBT; - HelpButton aHelpBT; - FixedLine aSelectionGB; - SvTabListBox aSelectionLB; - HeaderBar aSelectionHB; - DBChangeDialogConfig_Impl aConfig; - String aEntryST; - String aURLST; + OKButton aOKBT; + CancelButton aCancelBT; + HelpButton aHelpBT; + FixedLine aSelectionGB; + SvTabListBox aSelectionLB; + HeaderBar aSelectionHB; + DBChangeDialogConfig_Impl aConfig; + String aEntryST; + String aURLST; BibDataManager* pDatMan; -// DECL_LINK(EndDragHdl, HeaderBar*); +// DECL_LINK(EndDragHdl, HeaderBar*); DECL_LINK(DoubleClickHdl, SvTabListBox*); public: DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ); ~DBChangeDialog_Impl(); - String GetCurrentURL()const; + String GetCurrentURL()const; }; /*-- 18.11.99 10:35:20--------------------------------------------------- @@ -618,12 +618,12 @@ public: -----------------------------------------------------------------------*/ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) : ModalDialog(pParent, BibResId(RID_DLG_DBCHANGE) ), - aOKBT(this, BibResId( BT_OK )), - aCancelBT(this, BibResId( BT_CANCEL )), - aHelpBT(this, BibResId( BT_HELP )), - aSelectionGB(this, BibResId( GB_SELECTION )), - aSelectionLB(this, BibResId( LB_SELECTION )), - aSelectionHB(this, BibResId( HB_SELECTION )), + aOKBT(this, BibResId( BT_OK )), + aCancelBT(this, BibResId( BT_CANCEL )), + aHelpBT(this, BibResId( BT_HELP )), + aSelectionGB(this, BibResId( GB_SELECTION )), + aSelectionLB(this, BibResId( LB_SELECTION )), + aSelectionHB(this, BibResId( HB_SELECTION )), aEntryST(BibResId(ST_ENTRY)), aURLST( BibResId(ST_URL)), pDatMan(pMan) @@ -663,7 +663,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan ) } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl"); } @@ -699,7 +699,7 @@ DBChangeDialog_Impl::~DBChangeDialog_Impl() /* -----------------18.11.99 12:36------------------- --------------------------------------------------*/ -String DBChangeDialog_Impl::GetCurrentURL()const +String DBChangeDialog_Impl::GetCurrentURL()const { String sRet; SvLBoxEntry* pEntry = aSelectionLB.FirstSelected(); @@ -809,9 +809,9 @@ BibDataManager::BibDataManager() --------------------------------------------------*/ BibDataManager::~BibDataManager() { - Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); - Reference< XPropertySet > xPrSet( m_xForm, UNO_QUERY ); - Reference< XComponent > xComp( m_xForm, UNO_QUERY ); + Reference< XLoadable > xLoad( m_xForm, UNO_QUERY ); + Reference< XPropertySet > xPrSet( m_xForm, UNO_QUERY ); + Reference< XComponent > xComp( m_xForm, UNO_QUERY ); if ( m_xForm.is() ) { Reference< XComponent > xConnection; @@ -871,8 +871,8 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) ::rtl::OUString sCurrentModelType; const ::rtl::OUString sType(C2U("Type")); sal_Int32 nType = 0; - sal_Bool bIsFormatted = sal_False; - sal_Bool bFormattedIsNumeric = sal_True; + sal_Bool bIsFormatted = sal_False; + sal_Bool bFormattedIsNumeric = sal_True; xField->getPropertyValue(sType) >>= nType; switch(nType) { @@ -909,7 +909,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) xCurrentCol->setPropertyValue(C2U("TreatAsNumber"), aFormatted); } Any aColName = makeAny( *pFields ); - xCurrentCol->setPropertyValue(FM_PROP_CONTROLSOURCE, aColName); + xCurrentCol->setPropertyValue(FM_PROP_CONTROLSOURCE, aColName); xCurrentCol->setPropertyValue(FM_PROP_LABEL, aColName); xColContainer->insertByName( *pFields, makeAny( xCurrentCol ) ); @@ -917,21 +917,21 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid) } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("Exception in BibDataManager::InsertFields"); } } /* -------------------------------------------------- --------------------------------------------------*/ -Reference< awt::XControlModel > BibDataManager::updateGridModel() +Reference< awt::XControlModel > BibDataManager::updateGridModel() { return updateGridModel( m_xForm ); } /* -------------------------------------------------- --------------------------------------------------*/ -Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) +Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) { try { @@ -944,8 +944,8 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< m_xGridModel = createGridModel( gGridName ); Reference< XNameContainer > xNameCont(xDbForm, UNO_QUERY); -// if (xNameCont->hasByName(sName)) -// xNameCont->removeByName(sName); +// if (xNameCont->hasByName(sName)) +// xNameCont->removeByName(sName); // xNameCont->insertByName( sName, makeAny( m_xGridModel ) ); } @@ -956,7 +956,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::updateGridModel: something went wrong !"); } @@ -966,9 +966,9 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< /* -------------------------------------------------- --------------------------------------------------*/ -Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) +Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) { - Reference< XForm > xResult; + Reference< XForm > xResult; try { Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); @@ -989,7 +989,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) aVal <<= (sal_Int32)50; aPropertySet->setPropertyValue(C2U("FetchSize"), aVal); - Reference< XConnection > xConnection = getConnection(rDesc.sDataSource); + Reference< XConnection > xConnection = getConnection(rDesc.sDataSource); aVal <<= xConnection; aPropertySet->setPropertyValue(C2U("ActiveConnection"), aVal); @@ -1018,7 +1018,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) aPropertySet->setPropertyValue(C2U("CommandType"), aVal); - Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); + Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); aQuoteChar = xMetaData->getIdentifierQuoteString(); Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); @@ -1042,7 +1042,7 @@ Reference< XForm > BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc) } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::createDatabaseForm: something went wrong !"); } @@ -1065,7 +1065,7 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources() } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::getDataSources: something went wrong !"); } @@ -1180,7 +1180,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) Reference< XComponent > xOldConnection; aPropertySet->getPropertyValue(C2U("ActiveConnection")) >>= xOldConnection; - Reference< XConnection > xConnection = getConnection(rURL); + Reference< XConnection > xConnection = getConnection(rURL); if(!xConnection.is()) { aDataSourceURL = sTmp; @@ -1230,7 +1230,7 @@ void BibDataManager::setActiveDataSource(const ::rtl::OUString& rURL) FeatureStateEvent aEvent; util::URL aURL; aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; + aEvent.Requery = sal_False; aEvent.FeatureDescriptor = getActiveDataTable(); aEvent.State = makeAny( getDataSources() ); @@ -1259,7 +1259,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) if(aPropertySet.is()) { - Reference< XConnection > xConnection = getConnection( m_xForm ); + Reference< XConnection > xConnection = getConnection( m_xForm ); Reference< XTablesSupplier > xSupplyTables(xConnection, UNO_QUERY); Reference< XNameAccess > xAccess = xSupplyTables->getTables(); Sequence< ::rtl::OUString > aTableNameSeq = xAccess->getElementNames(); @@ -1280,7 +1280,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) } if (pTableNames != pTableNamesEnd) { - Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); + Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData(); aQuoteChar = xMetaData->getIdentifierQuoteString(); Reference< XMultiServiceFactory > xFactory(xConnection, UNO_QUERY); @@ -1309,7 +1309,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable) } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::setActiveDataTable: something went wrong !"); } @@ -1410,9 +1410,9 @@ void SAL_CALL BibDataManager::removeLoadListener( const Reference< XLoadListener } //------------------------------------------------------------------------ -Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName) +Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUString& rName) { - Reference< awt::XControlModel > xModel; + Reference< awt::XControlModel > xModel; try { @@ -1442,7 +1442,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::createGridModel: something went wrong !"); } @@ -1489,10 +1489,10 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS return aResStr; } //------------------------------------------------------------------------ -Reference< awt::XControlModel > BibDataManager::loadControlModel( +Reference< awt::XControlModel > BibDataManager::loadControlModel( const ::rtl::OUString& rName, sal_Bool bForceListBox) { - Reference< awt::XControlModel > xModel; + Reference< awt::XControlModel > xModel; ::rtl::OUString aName(C2U("View_")); aName += rName; @@ -1565,7 +1565,7 @@ Reference< awt::XControlModel > BibDataManager::loadControlModel( } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::loadControlModel: something went wrong !"); } return xModel; @@ -1606,7 +1606,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("::propertyChange: something went wrong !"); } @@ -1651,7 +1651,7 @@ try } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener"); } @@ -1697,7 +1697,7 @@ try } catch(Exception& e ) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener"); } @@ -1712,9 +1712,9 @@ void BibDataManager::CreateMappingDialog(Window* pParent) if(RET_OK == pDlg->Execute() && pBibView) { reload(); -// unload(); -// pBibView->UpdatePages(); -// load(); +// unload(); +// pBibView->UpdatePages(); +// load(); } delete pDlg; } diff --git a/extensions/source/bibliography/datman.hrc b/extensions/source/bibliography/datman.hrc index 97f72cf98431..5ea4749eef1c 100644 --- a/extensions/source/bibliography/datman.hrc +++ b/extensions/source/bibliography/datman.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,15 +26,15 @@ ************************************************************************/ -#define BT_OK 1 +#define BT_OK 1 #define BT_CANCEL 2 #define BT_HELP 3 #define GB_MAPPING 4 #define FT_IDENTIFIER 5 #define LB_IDENTIFIER 6 -#define ST_NONE 7 +#define ST_NONE 7 -#define FT_AUTHORITYTYPE 8 +#define FT_AUTHORITYTYPE 8 #define LB_AUTHORITYTYPE 9 #define FT_ADDRESS 10 #define LB_ADDRESS 11 @@ -95,8 +95,8 @@ #define FT_CUSTOM5 66 #define LB_CUSTOM5 67 -#define GB_SELECTION 68 -#define ST_ENTRY 69 -#define LB_SELECTION 71 -#define HB_SELECTION 72 +#define GB_SELECTION 68 +#define ST_ENTRY 69 +#define LB_SELECTION 71 +#define HB_SELECTION 72 diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 7a499b785e71..4f485641e9e1 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,28 +73,28 @@ public: BibInterceptorHelper( ::bib::BibBeamer* pBibBeamer, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > xDispatch); void ReleaseInterceptor(); - + // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw (::com::sun::star::uno::RuntimeException); - // XDispatchProviderInterceptor + // XDispatchProviderInterceptor virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSlaveDispatchProvider ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewMasterDispatchProvider ) throw (::com::sun::star::uno::RuntimeException); }; -typedef cppu::WeakComponentImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener - , ::com::sun::star::form::XLoadable - > BibDataManager_Base; +typedef cppu::WeakComponentImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener + , ::com::sun::star::form::XLoadable + > BibDataManager_Base; class BibDataManager :public ::comphelper::OMutexAndBroadcastHelper ,public BibDataManager_Base { private: - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > m_xGridModel; - ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps; + ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > m_xForm; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > m_xGridModel; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xSourceProps; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > m_xParser; ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > m_xFormCtrl; // #100312# ------------------- @@ -102,24 +102,24 @@ private: BibInterceptorHelper* m_pInterceptorHelper; ::rtl::OUString aActiveDataTable; - ::rtl::OUString aDataSourceURL; - ::rtl::OUString aQuoteChar; - ::com::sun::star::uno::Any aUID; - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor; + ::rtl::OUString aDataSourceURL; + ::rtl::OUString aQuoteChar; + ::com::sun::star::uno::Any aUID; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > xBibCursor; - ::cppu::OInterfaceContainerHelper m_aLoadListeners; + ::cppu::OInterfaceContainerHelper m_aLoadListeners; - ::bib::BibView* pBibView; - BibToolBar* pToolbar; + ::bib::BibView* pBibView; + BibToolBar* pToolbar; - rtl::OUString sIdentifierMapping; + rtl::OUString sIdentifierMapping; protected: - void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); - void SetMeAsUidListener(); - void RemoveMeAsUidListener(); + void InsertFields(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent > & xGrid); + void SetMeAsUidListener(); + void RemoveMeAsUidListener(); - void UpdateAddressbookCursor(::rtl::OUString aSourceName); + void UpdateAddressbookCursor(::rtl::OUString aSourceName); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > & xDbForm); @@ -141,53 +141,53 @@ public: BibDataManager(); ~BibDataManager(); - virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) + virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException ); - ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); + ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm > createDatabaseForm( BibDBDescriptor& aDesc); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(); + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > updateGridModel(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getDataSources(); + ::com::sun::star::uno::Sequence< ::rtl::OUString> getDataSources(); - ::rtl::OUString getActiveDataSource() {return aDataSourceURL;} - void setActiveDataSource(const ::rtl::OUString& rURL); + ::rtl::OUString getActiveDataSource() {return aDataSourceURL;} + void setActiveDataSource(const ::rtl::OUString& rURL); - ::rtl::OUString getActiveDataTable(); - void setActiveDataTable(const ::rtl::OUString& rTable); + ::rtl::OUString getActiveDataTable(); + void setActiveDataTable(const ::rtl::OUString& rTable); - void setFilter(const ::rtl::OUString& rQuery); - ::rtl::OUString getFilter(); + void setFilter(const ::rtl::OUString& rQuery); + ::rtl::OUString getFilter(); - ::com::sun::star::uno::Sequence< ::rtl::OUString> getQueryFields(); - ::rtl::OUString getQueryField(); - void startQueryWith(const ::rtl::OUString& rQuery); + ::com::sun::star::uno::Sequence< ::rtl::OUString> getQueryFields(); + ::rtl::OUString getQueryField(); + void startQueryWith(const ::rtl::OUString& rQuery); - const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } - const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } + const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& getParser() { return m_xParser; } + const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& getForm() { return m_xForm; } - ::rtl::OUString getControlName(sal_Int32 nFormatKey ); + ::rtl::OUString getControlName(sal_Int32 nFormatKey ); - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const ::rtl::OUString& rName, + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > loadControlModel(const ::rtl::OUString& rName, sal_Bool bForceListBox = sal_False); - void CreateMappingDialog(Window* pParent); + void CreateMappingDialog(Window* pParent); ::rtl::OUString CreateDBChangeDialog(Window* pParent); void DispatchDBChangeDialog(); - sal_Bool HasActiveConnection() const; + sal_Bool HasActiveConnection() const; - void SetView( ::bib::BibView* pView ) { pBibView = pView; } + void SetView( ::bib::BibView* pView ) { pBibView = pView; } - void SetToolbar(BibToolBar* pSet); + void SetToolbar(BibToolBar* pSet); - const rtl::OUString& GetIdentifierMapping(); - void ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();} + const rtl::OUString& GetIdentifierMapping(); + void ResetIdentifierMapping() {sIdentifierMapping = rtl::OUString();} ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(); // #100312# ---------- diff --git a/extensions/source/bibliography/datman.src b/extensions/source/bibliography/datman.src index 0a0643b1b117..6b8c4b00ef41 100644 --- a/extensions/source/bibliography/datman.src +++ b/extensions/source/bibliography/datman.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,7 +55,7 @@ ModalDialog RID_DLG_MAPPING Size = MAP_APPFONT ( 329 , 8 ) ; Text [ en-US ] = "Column names"; }; - FixedText FT_IDENTIFIER + FixedText FT_IDENTIFIER { Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx index db61efc3e7c3..22ee46485b04 100644 --- a/extensions/source/bibliography/formcontrolcontainer.cxx +++ b/extensions/source/bibliography/formcontrolcontainer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,7 +129,7 @@ namespace bib } catch( const Exception& e) { - (void) e; // make compiler happy + (void) e; // make compiler happy DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" ); } } @@ -176,7 +176,7 @@ namespace bib } //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/formcontrolcontainer.hxx b/extensions/source/bibliography/formcontrolcontainer.hxx index b80b60d8bc75..a1e72b11a222 100644 --- a/extensions/source/bibliography/formcontrolcontainer.hxx +++ b/extensions/source/bibliography/formcontrolcontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,23 +48,23 @@ namespace bib ,public ::bib::OLoadListener { private: - OLoadListenerAdapter* m_pFormAdapter; + OLoadListenerAdapter* m_pFormAdapter; ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xForm; private: - void implSetDesignMode( sal_Bool _bDesign ); + void implSetDesignMode( sal_Bool _bDesign ); protected: FormControlContainer( ); ~FormControlContainer( ); - sal_Bool isFormConnected() const { return NULL != m_pFormAdapter; } - void connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm ); - void disconnectForm(); + sal_Bool isFormConnected() const { return NULL != m_pFormAdapter; } + void connectForm( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable >& _rxForm ); + void disconnectForm(); - void ensureDesignMode(); + void ensureDesignMode(); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > getControlContainer() = 0; protected: @@ -78,7 +78,7 @@ namespace bib }; //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... #endif // EXTENSIONS_BIB_FORMCONTROLCONTAINER_HXX diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 1194982782c3..495362294602 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -139,7 +139,7 @@ const CmdToInfoCache& GetCommandToInfoCache() bCacheInitialized = sal_True; } } - + return aCmdToInfoCache; } @@ -147,10 +147,10 @@ const CmdToInfoCache& GetCommandToInfoCache() class BibFrameCtrl_Impl : public cppu::WeakImplHelper1 < XFrameActionListener > { public: - Mutex aMutex; - OMultiTypeInterfaceContainerHelper aLC; + Mutex aMutex; + OMultiTypeInterfaceContainerHelper aLC; - BibFrameController_Impl* pController; + BibFrameController_Impl* pController; BibFrameCtrl_Impl() : aLC( aMutex ) @@ -159,8 +159,8 @@ public: ~BibFrameCtrl_Impl(); - virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException ); - virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL frameAction(const FrameActionEvent& aEvent) throw( RuntimeException ); + virtual void SAL_CALL disposing( const lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); }; @@ -235,7 +235,7 @@ sal_Bool SAL_CALL BibFrameController_Impl::supportsService( const ::rtl::OUStrin // base services are included there and should be asked by uno-rtti. ::com::sun::star::uno::Sequence< ::rtl::OUString > lNames(1); lNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.Bibliography"); - return lNames; + return lNames; } void BibFrameController_Impl::attachFrame( const uno::Reference< XFrame > & xArg ) throw (::com::sun::star::uno::RuntimeException) @@ -298,7 +298,7 @@ void BibFrameController_Impl::removeEventListener( const uno::Reference< lang::X pImp->aLC.removeInterface( ::getCppuType((const Reference< lang::XEventListener >*)0), aListener ); } -uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) +uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( const util::URL& aURL, const rtl::OUString& /*aTarget*/, sal_Int32 /*nSearchFlags*/ ) throw (::com::sun::star::uno::RuntimeException) { if ( !bDisposing ) { @@ -306,7 +306,7 @@ uno::Reference< frame::XDispatch > BibFrameController_Impl::queryDispatch( cons CmdToInfoCache::const_iterator pIter = rCmdCache.find( aURL.Complete ); if ( pIter != rCmdCache.end() ) { - if (( pDatMan->HasActiveConnection() ) || + if (( pDatMan->HasActiveConnection() ) || ( !pIter->second.bActiveConnection )) return (frame::XDispatch*) this; } @@ -323,7 +323,7 @@ uno::Sequence<uno::Reference< XDispatch > > BibFrameController_Impl::queryDispat return aDispatches; } -uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups() +uno::Sequence< ::sal_Int16 > SAL_CALL BibFrameController_Impl::getSupportedCommandGroups() throw (::com::sun::star::uno::RuntimeException) { uno::Sequence< ::sal_Int16 > aDispatchInfo( 4 ); @@ -335,12 +335,12 @@ throw (::com::sun::star::uno::RuntimeException) return aDispatchInfo; } - -uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup ) + +uno::Sequence< frame::DispatchInformation > SAL_CALL BibFrameController_Impl::getConfigurableDispatchInformation( ::sal_Int16 nCommandGroup ) throw (::com::sun::star::uno::RuntimeException) { const CmdToInfoCache& rCmdCache = GetCommandToInfoCache(); - + sal_Bool bGroupFound( sal_False ); frame::DispatchInformation aDispatchInfo; std::list< frame::DispatchInformation > aDispatchInfoList; @@ -369,7 +369,7 @@ throw (::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchInformation > aSeq = comphelper::containerToSequence< ::com::sun::star::frame::DispatchInformation, std::list< ::com::sun::star::frame::DispatchInformation > >( aDispatchInfoList ); - + return aSeq; } @@ -422,7 +422,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X } Window* lcl_GetFocusChild( Window* pParent ) -{ +{ USHORT nChildren = pParent->GetChildCount(); for( USHORT nChild = 0; nChild < nChildren; ++nChild) { @@ -484,8 +484,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; pObj->xListener->statusChanged( aEvent ); //break; because there are more than one } @@ -571,8 +571,8 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = 0 != pDatMan->getParser()->getFilter().getLength(); - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; pObj->xListener->statusChanged( aEvent ); } } @@ -673,29 +673,29 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) - { + { KeyEvent aEvent( 0, KEYFUNC_CUT ); pChild->KeyInput( aEvent ); } - } + } else if(aCommand.EqualsAscii("Copy")) { Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) - { + { KeyEvent aEvent( 0, KEYFUNC_COPY ); pChild->KeyInput( aEvent ); } - } + } else if(aCommand.EqualsAscii("Paste")) { Window* pChild = lcl_GetFocusChild( VCLUnoHelper::GetWindow( xWindow ) ); if(pChild) - { + { KeyEvent aEvent( 0, KEYFUNC_PASTE ); pChild->KeyInput( aEvent ); } - } + } } } IMPL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void*, EMPTYARG ) @@ -813,7 +813,7 @@ void BibFrameController_Impl::addStatusListener( { } } - } + } uno::Reference< datatransfer::XTransferable > xContents = xClip->getContents( ); } } @@ -829,12 +829,12 @@ void BibFrameController_Impl::addStatusListener( xSet->getPropertyValue(C2U("RowCount")) >>= nCount; aEvent.IsEnabled = nCount > 0; } - } + } else if (aURL.Path == C2U("Bib/InsertRecord")) { Reference< beans::XPropertySet > xSet(pDatMan->getForm(), UNO_QUERY); aEvent.IsEnabled = canInsertRecords(xSet); - } + } aListener->statusChanged( aEvent ); } //----------------------------------------------------------------------------- @@ -879,8 +879,8 @@ void BibFrameController_Impl::RemoveFilter() FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = sal_False; - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; pObj->xListener->statusChanged( aEvent ); bRemoveFilter=sal_True; } @@ -889,8 +889,8 @@ void BibFrameController_Impl::RemoveFilter() FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; aEvent.State <<= aQuery; pObj->xListener->statusChanged( aEvent ); bQueryText=sal_True; @@ -919,7 +919,7 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope aDBTableName = pDatMan->getActiveDataTable(); } else - { + { m_xDatMan->unload(); pDatMan->setActiveDataTable(aDBTableName); pDatMan->updateGridModel(); @@ -939,8 +939,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; aEvent.FeatureDescriptor=pDatMan->getQueryField(); uno::Sequence<rtl::OUString> aStringSeq=pDatMan->getQueryFields(); @@ -954,8 +954,8 @@ void BibFrameController_Impl::ChangeDataSource(const uno::Sequence< beans::Prope FeatureStateEvent aEvent; aEvent.FeatureURL = pObj->aURL; aEvent.IsEnabled = sal_True; - aEvent.Requery = sal_False; - aEvent.Source = (XDispatch *) this; + aEvent.Requery = sal_False; + aEvent.Source = (XDispatch *) this; BibConfig* pConfig = BibModul::GetConfig(); aEvent.State <<= pConfig->getQueryText(); pObj->xListener->statusChanged( aEvent ); diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx index 5cd7e9d46471..4ef00f967fed 100644 --- a/extensions/source/bibliography/framectr.hxx +++ b/extensions/source/bibliography/framectr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,9 +49,9 @@ namespace com{namespace sun{namespace star{ class BibStatusDispatch { public: - ::com::sun::star::util::URL aURL; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; - BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef ) + ::com::sun::star::util::URL aURL; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xListener; + BibStatusDispatch( const ::com::sun::star::util::URL& rURL, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef ) : aURL( rURL ) , xListener( xRef ) {} @@ -69,15 +69,15 @@ class BibFrameController_Impl : public cppu::WeakImplHelper5 < > { friend class BibFrameCtrl_Impl; - BibFrameCtrl_Impl* pImp; - BibStatusDispatchArr aStatusListeners; - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; - sal_Bool bDisposing; - sal_Bool bHierarchical; - ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xDatMan; - BibDataManager* pDatMan; - HdlBibModul pBibMod; + BibFrameCtrl_Impl* pImp; + BibStatusDispatchArr aStatusListeners; + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > xWindow; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > xFrame; + sal_Bool bDisposing; + sal_Bool bHierarchical; + ::com::sun::star::uno::Reference< ::com::sun::star::form::XLoadable > m_xDatMan; + BibDataManager* pDatMan; + HdlBibModul pBibMod; DECL_STATIC_LINK( BibFrameController_Impl, DisposeHdl, void* ); @@ -88,11 +88,11 @@ public: ~BibFrameController_Impl(); - void activate(); - void deactivate(); + void activate(); + void deactivate(); - void ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); - void RemoveFilter(); + void ChangeDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs); + void RemoveFilter(); // ::com::sun::star::lang::XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException); @@ -100,27 +100,27 @@ public: virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XController - virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & xFrame ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL attachModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & xModel ) throw (::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL suspend( sal_Bool bSuspend ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getViewData() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL restoreViewData( const ::com::sun::star::uno::Any& Value ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SAL_CALL getFrame() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > SAL_CALL getModel() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XComponent - virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener ) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches( const ::com::sun::star::uno::Sequence< ::com::sun::star::frame::DispatchDescriptor >& aDescripts) throw (::com::sun::star::uno::RuntimeException); //class ::com::sun::star::frame::XDispatch - virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dispatch(const ::com::sun::star::util::URL& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeStatusListener(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xControl, const ::com::sun::star::util::URL& aURL) throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::frame::XDispatchInformationProvider virtual ::com::sun::star::uno::Sequence< ::sal_Int16 > SAL_CALL getSupportedCommandGroups( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 3cee7f8b8364..c699aff5d485 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -96,9 +96,9 @@ OUString lcl_GetColumnName( const Mapping* pMapping, sal_uInt16 nIndexPos ) /* -----------------------------04.01.00 10:54-------------------------------- ---------------------------------------------------------------------------*/ -class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener> +class BibPosListener :public cppu::WeakImplHelper1 <sdbc::XRowSetListener> { - BibGeneralPage* pParentPage; + BibGeneralPage* pParentPage; public: BibPosListener(BibGeneralPage* pParent); @@ -162,7 +162,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno { uno::Any aVal = xValueAcc->getByName(uTypeMapping); uno::Reference< uno::XInterface > xInt = *(uno::Reference< uno::XInterface > *)aVal.getValue(); - uno::Reference< sdb::XColumn > xCol(xInt, UNO_QUERY); + uno::Reference< sdb::XColumn > xCol(xInt, UNO_QUERY); DBG_ASSERT(xCol.is(), "BibPosListener::positioned : invalid column (no sdb::XColumn) !"); if (xCol.is()) { @@ -189,7 +189,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno } catch(Exception& rEx) { - (void) rEx; // make compiler happy + (void) rEx; // make compiler happy DBG_ERROR("BibPosListener::positioned: something went wrong !"); } } @@ -206,40 +206,40 @@ void BibPosListener::disposing(const lang::EventObject& /*Source*/) throw( uno:: BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): BibTabPage(pParent,BibResId(RID_TP_GENERAL)), aControlParentWin(this, WB_DIALOGCONTROL), - aIdentifierFT(&aControlParentWin, BibResId(FT_IDENTIFIER )), - aAuthTypeFT(&aControlParentWin, BibResId(FT_AUTHTYPE )), - aYearFT(&aControlParentWin, BibResId(FT_YEAR )), - aAuthorFT(&aControlParentWin, BibResId(FT_AUTHOR )), - aTitleFT(&aControlParentWin, BibResId(FT_TITLE )), - aPublisherFT(&aControlParentWin, BibResId(FT_PUBLISHER )), - aAddressFT(&aControlParentWin, BibResId(FT_ADDRESS )), - aISBNFT(&aControlParentWin, BibResId(FT_ISBN )), - aChapterFT(&aControlParentWin, BibResId(FT_CHAPTER )), - aPagesFT(&aControlParentWin, BibResId(FT_PAGE )), + aIdentifierFT(&aControlParentWin, BibResId(FT_IDENTIFIER )), + aAuthTypeFT(&aControlParentWin, BibResId(FT_AUTHTYPE )), + aYearFT(&aControlParentWin, BibResId(FT_YEAR )), + aAuthorFT(&aControlParentWin, BibResId(FT_AUTHOR )), + aTitleFT(&aControlParentWin, BibResId(FT_TITLE )), + aPublisherFT(&aControlParentWin, BibResId(FT_PUBLISHER )), + aAddressFT(&aControlParentWin, BibResId(FT_ADDRESS )), + aISBNFT(&aControlParentWin, BibResId(FT_ISBN )), + aChapterFT(&aControlParentWin, BibResId(FT_CHAPTER )), + aPagesFT(&aControlParentWin, BibResId(FT_PAGE )), aFirstFL(&aControlParentWin, BibResId(FL_1 )), - aEditorFT(&aControlParentWin, BibResId(FT_EDITOR )), - aEditionFT(&aControlParentWin, BibResId(FT_EDITION )), - aBooktitleFT(&aControlParentWin, BibResId(FT_BOOKTITLE )), - aVolumeFT(&aControlParentWin, BibResId(FT_VOLUME )), - aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED )), - aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION )), - aInstitutionFT(&aControlParentWin, BibResId(FT_INSTITUTION )), - aSchoolFT(&aControlParentWin, BibResId(FT_SCHOOL )), - aReportTypeFT(&aControlParentWin, BibResId(FT_REPORT )), - aMonthFT(&aControlParentWin, BibResId(FT_MONTH )), + aEditorFT(&aControlParentWin, BibResId(FT_EDITOR )), + aEditionFT(&aControlParentWin, BibResId(FT_EDITION )), + aBooktitleFT(&aControlParentWin, BibResId(FT_BOOKTITLE )), + aVolumeFT(&aControlParentWin, BibResId(FT_VOLUME )), + aHowpublishedFT(&aControlParentWin, BibResId(FT_HOWPUBLISHED )), + aOrganizationsFT(&aControlParentWin,BibResId(FT_ORGANIZATION )), + aInstitutionFT(&aControlParentWin, BibResId(FT_INSTITUTION )), + aSchoolFT(&aControlParentWin, BibResId(FT_SCHOOL )), + aReportTypeFT(&aControlParentWin, BibResId(FT_REPORT )), + aMonthFT(&aControlParentWin, BibResId(FT_MONTH )), aSecondFL(&aControlParentWin, BibResId(FL_2 )), - aJournalFT(&aControlParentWin, BibResId(FT_JOURNAL )), - aNumberFT(&aControlParentWin, BibResId(FT_NUMBER )), - aSeriesFT(&aControlParentWin, BibResId(FT_SERIES )), - aAnnoteFT(&aControlParentWin, BibResId(FT_ANNOTE )), - aNoteFT(&aControlParentWin, BibResId(FT_NOTE )), - aURLFT(&aControlParentWin, BibResId(FT_URL )), + aJournalFT(&aControlParentWin, BibResId(FT_JOURNAL )), + aNumberFT(&aControlParentWin, BibResId(FT_NUMBER )), + aSeriesFT(&aControlParentWin, BibResId(FT_SERIES )), + aAnnoteFT(&aControlParentWin, BibResId(FT_ANNOTE )), + aNoteFT(&aControlParentWin, BibResId(FT_NOTE )), + aURLFT(&aControlParentWin, BibResId(FT_URL )), aThirdFL(&aControlParentWin, BibResId(FL_3 )), - aCustom1FT(&aControlParentWin, BibResId(FT_CUSTOM1 )), - aCustom2FT(&aControlParentWin, BibResId(FT_CUSTOM2 )), - aCustom3FT(&aControlParentWin, BibResId(FT_CUSTOM3 )), - aCustom4FT(&aControlParentWin, BibResId(FT_CUSTOM4 )), - aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )), + aCustom1FT(&aControlParentWin, BibResId(FT_CUSTOM1 )), + aCustom2FT(&aControlParentWin, BibResId(FT_CUSTOM2 )), + aCustom3FT(&aControlParentWin, BibResId(FT_CUSTOM3 )), + aCustom4FT(&aControlParentWin, BibResId(FT_CUSTOM4 )), + aCustom5FT(&aControlParentWin, BibResId(FT_CUSTOM5 )), aHoriScroll(this, WB_HORZ), aVertScroll(this, WB_VERT), sErrorPrefix(BibResId(ST_ERROR_PREFIX)), @@ -253,24 +253,24 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): aBibTypeArr[1] = String(BibResId(ST_TYPE_BOOK)); aBibTypeArr[2] = String(BibResId(ST_TYPE_BOOKLET)); aBibTypeArr[3] = String(BibResId(ST_TYPE_CONFERENCE)); - aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK )); + aBibTypeArr[4] = String(BibResId(ST_TYPE_INBOOK )); aBibTypeArr[5] = String(BibResId(ST_TYPE_INCOLLECTION)); aBibTypeArr[6] = String(BibResId(ST_TYPE_INPROCEEDINGS)); - aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL )); - aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL )); + aBibTypeArr[7] = String(BibResId(ST_TYPE_JOURNAL )); + aBibTypeArr[8] = String(BibResId(ST_TYPE_MANUAL )); aBibTypeArr[9] = String(BibResId(ST_TYPE_MASTERSTHESIS)); - aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC )); - aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS )); - aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS )); - aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT )); - aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED )); - aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL )); - aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW )); - aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1 )); - aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2 )); - aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3 )); - aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4 )); - aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5 )); + aBibTypeArr[10] = String(BibResId(ST_TYPE_MISC )); + aBibTypeArr[11] = String(BibResId(ST_TYPE_PHDTHESIS )); + aBibTypeArr[12] = String(BibResId(ST_TYPE_PROCEEDINGS )); + aBibTypeArr[13] = String(BibResId(ST_TYPE_TECHREPORT )); + aBibTypeArr[14] = String(BibResId(ST_TYPE_UNPUBLISHED )); + aBibTypeArr[15] = String(BibResId(ST_TYPE_EMAIL )); + aBibTypeArr[16] = String(BibResId(ST_TYPE_WWW )); + aBibTypeArr[17] = String(BibResId(ST_TYPE_CUSTOM1 )); + aBibTypeArr[18] = String(BibResId(ST_TYPE_CUSTOM2 )); + aBibTypeArr[19] = String(BibResId(ST_TYPE_CUSTOM3 )); + aBibTypeArr[20] = String(BibResId(ST_TYPE_CUSTOM4 )); + aBibTypeArr[21] = String(BibResId(ST_TYPE_CUSTOM5 )); FreeResource(); @@ -310,7 +310,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): // the control should be a bit smaller than the fixed text Size aControlSize(aIdentifierFT.GetSizePixel()); aControlSize.Width() = aControlSize.Width() * 8 / 10; - + AddControlWithError( lcl_GetColumnName( pMapping, IDENTIFIER_POS ), lcl_MovePoint( aIdentifierFT ), aControlSize, sTableErrorString, aIdentifierFT.GetText(), HID_BIB_IDENTIFIER_POS, 0 ); @@ -321,7 +321,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): aAuthTypeFT.GetText(), HID_BIB_AUTHORITYTYPE_POS, 1 ); ::Point aYearPos = lcl_MovePoint(aYearFT); - AddControlWithError( lcl_GetColumnName( pMapping, YEAR_POS ), aYearPos, + AddControlWithError( lcl_GetColumnName( pMapping, YEAR_POS ), aYearPos, aControlSize, sTableErrorString, aYearFT.GetText(), HID_BIB_YEAR_POS, 4 ); AddControlWithError( lcl_GetColumnName(pMapping, AUTHOR_POS), lcl_MovePoint(aAuthorFT), @@ -345,19 +345,19 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): AddControlWithError( lcl_GetColumnName( pMapping, CHAPTER_POS ), lcl_MovePoint(aChapterFT), aControlSize, sTableErrorString, aChapterFT.GetText(), HID_BIB_CHAPTER_POS, 10 ); - AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( aPagesFT ), + AddControlWithError( lcl_GetColumnName( pMapping, PAGES_POS ), lcl_MovePoint( aPagesFT ), aControlSize, sTableErrorString, aPagesFT.GetText(), HID_BIB_PAGES_POS, 19 ); - AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( aEditorFT ), + AddControlWithError( lcl_GetColumnName( pMapping, EDITOR_POS ), lcl_MovePoint( aEditorFT ), aControlSize, sTableErrorString, aEditorFT.GetText(), HID_BIB_EDITOR_POS, 12 ); - AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(aEditionFT), + AddControlWithError( lcl_GetColumnName( pMapping, EDITION_POS ), lcl_MovePoint(aEditionFT), aControlSize, sTableErrorString, aEditionFT.GetText(), HID_BIB_EDITION_POS, 11 ); AddControlWithError( lcl_GetColumnName(pMapping, BOOKTITLE_POS), lcl_MovePoint(aBooktitleFT), aControlSize, sTableErrorString, aBooktitleFT.GetText(), HID_BIB_BOOKTITLE_POS, 9 ); - AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( aVolumeFT ), + AddControlWithError( lcl_GetColumnName( pMapping, VOLUME_POS ), lcl_MovePoint( aVolumeFT ), aControlSize, sTableErrorString, aVolumeFT.GetText(), HID_BIB_VOLUME_POS, 24 ); AddControlWithError( lcl_GetColumnName( pMapping, HOWPUBLISHED_POS ), lcl_MovePoint( aHowpublishedFT ), @@ -369,46 +369,46 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): AddControlWithError( lcl_GetColumnName( pMapping, INSTITUTION_POS ), lcl_MovePoint( aInstitutionFT ), aControlSize, sTableErrorString, aInstitutionFT.GetText(), HID_BIB_INSTITUTION_POS, 14 ); - AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( aSchoolFT ), + AddControlWithError( lcl_GetColumnName( pMapping, SCHOOL_POS ), lcl_MovePoint( aSchoolFT ), aControlSize, sTableErrorString, aSchoolFT.GetText(), HID_BIB_SCHOOL_POS, 20 ); AddControlWithError( lcl_GetColumnName( pMapping, REPORTTYPE_POS ), lcl_MovePoint( aReportTypeFT ), aControlSize, sTableErrorString, aReportTypeFT.GetText(), HID_BIB_REPORTTYPE_POS, 23 ); - AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( aMonthFT ), + AddControlWithError( lcl_GetColumnName( pMapping, MONTH_POS ), lcl_MovePoint( aMonthFT ), aControlSize, sTableErrorString, aMonthFT.GetText(), HID_BIB_MONTH_POS, 3 ); AddControlWithError( lcl_GetColumnName( pMapping, JOURNAL_POS ), lcl_MovePoint( aJournalFT ), aControlSize, sTableErrorString, aJournalFT.GetText(), HID_BIB_JOURNAL_POS, 15 ); - AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( aNumberFT ), + AddControlWithError( lcl_GetColumnName( pMapping, NUMBER_POS ), lcl_MovePoint( aNumberFT ), aControlSize, sTableErrorString, aNumberFT.GetText(), HID_BIB_NUMBER_POS, 17 ); - AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( aSeriesFT ), + AddControlWithError( lcl_GetColumnName( pMapping, SERIES_POS ), lcl_MovePoint( aSeriesFT ), aControlSize, sTableErrorString, aSeriesFT.GetText(), HID_BIB_SERIES_POS, 21 ); - AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( aAnnoteFT ), + AddControlWithError( lcl_GetColumnName( pMapping, ANNOTE_POS ), lcl_MovePoint( aAnnoteFT ), aControlSize, sTableErrorString, aAnnoteFT.GetText(), HID_BIB_ANNOTE_POS, 8 ); - AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( aNoteFT ), + AddControlWithError( lcl_GetColumnName( pMapping, NOTE_POS ), lcl_MovePoint( aNoteFT ), aControlSize, sTableErrorString, aNoteFT.GetText(), HID_BIB_NOTE_POS, 16 ); - AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( aURLFT ), + AddControlWithError( lcl_GetColumnName( pMapping, URL_POS ), lcl_MovePoint( aURLFT ), aControlSize, sTableErrorString, aURLFT.GetText(), HID_BIB_URL_POS, 25 ); AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM1_POS ), lcl_MovePoint( aCustom1FT ), aControlSize, sTableErrorString, aCustom1FT.GetText(), HID_BIB_CUSTOM1_POS, 26 ); - AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( aCustom2FT ), + AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM2_POS ), lcl_MovePoint( aCustom2FT ), aControlSize, sTableErrorString, aCustom2FT.GetText(), HID_BIB_CUSTOM2_POS, 27 ); - AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( aCustom3FT ), + AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM3_POS ), lcl_MovePoint( aCustom3FT ), aControlSize, sTableErrorString, aCustom3FT.GetText(), HID_BIB_CUSTOM3_POS, 28 ); - AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( aCustom4FT ), + AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM4_POS ), lcl_MovePoint( aCustom4FT ), aControlSize, sTableErrorString, aCustom4FT.GetText(), HID_BIB_CUSTOM4_POS, 29 ); - AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( aCustom5FT ), + AddControlWithError( lcl_GetColumnName( pMapping, CUSTOM5_POS ), lcl_MovePoint( aCustom5FT ), aControlSize, sTableErrorString, aCustom5FT.GetText(), HID_BIB_CUSTOM5_POS, 30 ); xPosListener = new BibPosListener(this); @@ -468,8 +468,8 @@ void BibGeneralPage::AddControlWithError( const OUString& rColumnName, const ::P { // adds also the XControl and creates a map entry in nFT2CtrlMap[] for mapping between control and FT - INT16 nIndex = -1; - uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex ); + INT16 nIndex = -1; + uno::Reference< awt::XControlModel > xTmp = AddXControl(rColumnName, rPos, rSize, nHelpId, nIndex ); if( xTmp.is() ) { DBG_ASSERT( nIndexInFTArray < FIELD_COUNT, "*BibGeneralPage::AddControlWithError(): wrong array index!" ); @@ -562,9 +562,9 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( // Peer als Child zu dem FrameWindow xCtrlContnr->addControl(rName, xControl); - uno::Reference< awt::XWindow > xCtrWin(xControl, UNO_QUERY ); + uno::Reference< awt::XWindow > xCtrWin(xControl, UNO_QUERY ); xCtrWin->addFocusListener( this ); - rIndex = -1; // -> implies, that not found + rIndex = -1; // -> implies, that not found for(USHORT i = 0; i < FIELD_COUNT; i++) if(!aControls[i].is()) { @@ -585,7 +585,7 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( } catch(Exception& rEx) { - (void) rEx; // make compiler happy + (void) rEx; // make compiler happy DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !"); } return xCtrModel; @@ -634,7 +634,7 @@ void BibGeneralPage::AdjustScrollbars() if(bHoriVisible) aControlParentWinSz.Height() -= aSize.Height(); if(bVertVisible) - aControlParentWinSz.Width() -= aSize.Width(); + aControlParentWinSz.Width() -= aSize.Width(); aControlParentWin.SetSizePixel(aControlParentWinSz); } @@ -648,39 +648,39 @@ void BibGeneralPage::Resize() void BibGeneralPage::InitFixedTexts( void ) { - String aFixedStrings[ FIELD_COUNT ] = + String aFixedStrings[ FIELD_COUNT ] = { - String( BibResId( ST_IDENTIFIER ) ), - String( BibResId( ST_AUTHTYPE ) ), - String( BibResId( ST_AUTHOR ) ), - String( BibResId( ST_TITLE ) ), - String( BibResId( ST_MONTH ) ), - String( BibResId( ST_YEAR ) ), - String( BibResId( ST_ISBN ) ), - String( BibResId( ST_BOOKTITLE ) ), - String( BibResId( ST_CHAPTER ) ), - String( BibResId( ST_EDITION ) ), - String( BibResId( ST_EDITOR ) ), - String( BibResId( ST_HOWPUBLISHED ) ), - String( BibResId( ST_INSTITUTION ) ), - String( BibResId( ST_JOURNAL ) ), - String( BibResId( ST_NOTE ) ), - String( BibResId( ST_ANNOTE ) ), - String( BibResId( ST_NUMBER ) ), - String( BibResId( ST_ORGANIZATION ) ), - String( BibResId( ST_PAGE ) ), - String( BibResId( ST_PUBLISHER ) ), - String( BibResId( ST_ADDRESS ) ), - String( BibResId( ST_SCHOOL ) ), - String( BibResId( ST_SERIES ) ), - String( BibResId( ST_REPORT ) ), - String( BibResId( ST_VOLUME ) ), - String( BibResId( ST_URL ) ), - String( BibResId( ST_CUSTOM1 ) ), - String( BibResId( ST_CUSTOM2 ) ), - String( BibResId( ST_CUSTOM3 ) ), - String( BibResId( ST_CUSTOM4 ) ), - String( BibResId( ST_CUSTOM5 ) ) + String( BibResId( ST_IDENTIFIER ) ), + String( BibResId( ST_AUTHTYPE ) ), + String( BibResId( ST_AUTHOR ) ), + String( BibResId( ST_TITLE ) ), + String( BibResId( ST_MONTH ) ), + String( BibResId( ST_YEAR ) ), + String( BibResId( ST_ISBN ) ), + String( BibResId( ST_BOOKTITLE ) ), + String( BibResId( ST_CHAPTER ) ), + String( BibResId( ST_EDITION ) ), + String( BibResId( ST_EDITOR ) ), + String( BibResId( ST_HOWPUBLISHED ) ), + String( BibResId( ST_INSTITUTION ) ), + String( BibResId( ST_JOURNAL ) ), + String( BibResId( ST_NOTE ) ), + String( BibResId( ST_ANNOTE ) ), + String( BibResId( ST_NUMBER ) ), + String( BibResId( ST_ORGANIZATION ) ), + String( BibResId( ST_PAGE ) ), + String( BibResId( ST_PUBLISHER ) ), + String( BibResId( ST_ADDRESS ) ), + String( BibResId( ST_SCHOOL ) ), + String( BibResId( ST_SERIES ) ), + String( BibResId( ST_REPORT ) ), + String( BibResId( ST_VOLUME ) ), + String( BibResId( ST_URL ) ), + String( BibResId( ST_CUSTOM1 ) ), + String( BibResId( ST_CUSTOM2 ) ), + String( BibResId( ST_CUSTOM3 ) ), + String( BibResId( ST_CUSTOM4 ) ), + String( BibResId( ST_CUSTOM5 ) ) }; aFixedTexts[0] = &aIdentifierFT; @@ -715,9 +715,9 @@ void BibGeneralPage::InitFixedTexts( void ) aFixedTexts[29] = &aCustom4FT; aFixedTexts[30] = &aCustom5FT; - int i; + int i; - MnemonicGenerator aMnemonicGenerator; + MnemonicGenerator aMnemonicGenerator; // init mnemonics, first register all strings for( i = 0 ; i < FIELD_COUNT ; ++i ) aMnemonicGenerator.RegisterMnemonic( aFixedStrings[ i ] ); @@ -812,7 +812,7 @@ void BibGeneralPage::disposing(const lang::EventObject& /*Source*/) throw( uno:: void BibGeneralPage::GetFocus() { - Reference< awt::XWindow >* pxControl = aControls; + Reference< awt::XWindow >* pxControl = aControls; for( int i = FIELD_COUNT ; i ; --i, ++pxControl ) { @@ -831,40 +831,40 @@ BOOL BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) { DBG_ASSERT( KEY_MOD2 == rKeyEvent.GetKeyCode().GetModifier(), "+BibGeneralPage::HandleShortCutKey(): this is not for me!" ); - const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); - const xub_Unicode c = rKeyEvent.GetCharCode(); - BOOL bHandled = FALSE; + const vcl::I18nHelper& rI18nHelper = Application::GetSettings().GetUILocaleI18nHelper(); + const xub_Unicode c = rKeyEvent.GetCharCode(); + BOOL bHandled = FALSE; - sal_Int16 i; + sal_Int16 i; - typedef std::vector< sal_Int16 > sal_Int16_vector; + typedef std::vector< sal_Int16 > sal_Int16_vector; - sal_Int16_vector::size_type nFocused = 0xFFFF; // index of focused in vector, no one focused initial + sal_Int16_vector::size_type nFocused = 0xFFFF; // index of focused in vector, no one focused initial DBG_ASSERT( nFocused > 0, "*BibGeneralPage::HandleShortCutKey(): size_type works not as expected!" ); - sal_Int16_vector aMatchList; + sal_Int16_vector aMatchList; for( i = 0 ; i < FIELD_COUNT ; ++i ) { if( rI18nHelper.MatchMnemonic( aFixedTexts[ i ]->GetText(), c ) ) { bHandled = TRUE; - sal_Int16 nCtrlIndex = nFT2CtrlMap[ i ]; + sal_Int16 nCtrlIndex = nFT2CtrlMap[ i ]; if( nCtrlIndex >= 0 ) - { // store index of control + { // store index of control DBG_ASSERT( aControls[ nCtrlIndex ].is(), "-BibGeneralPage::HandleShortCutKey(): valid index and no control?" ); uno::Reference< awt::XControl > xControl( aControls[ nCtrlIndex ], UNO_QUERY ); DBG_ASSERT( xControl.is(), "-BibGeneralPage::HandleShortCutKey(): a control wich is not a control!" ); - Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); + Window* pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); if( pWindow ) { aMatchList.push_back( nCtrlIndex ); if( pWindow->HasChildPathFocus() ) - { // save focused control + { // save focused control DBG_ASSERT( nFocused == 0xFFFF, "+BibGeneralPage::HandleShortCutKey(): more than one with focus?!" ); DBG_ASSERT( aMatchList.size() > 0, "+BibGeneralPage::HandleShortCutKey(): push_back and no content?!" ); nFocused = aMatchList.size() - 1; diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 2db696bbe1f3..5f2211cbdaba 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,69 +53,69 @@ typedef cppu::WeakAggImplHelper1 < ::com::sun::star::awt::XFocusListener > BibGe class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage { - Window aControlParentWin; - FixedText aIdentifierFT; - FixedText aAuthTypeFT; + Window aControlParentWin; + FixedText aIdentifierFT; + FixedText aAuthTypeFT; FixedText aYearFT; - FixedText aAuthorFT; + FixedText aAuthorFT; FixedText aTitleFT; - FixedText aPublisherFT; + FixedText aPublisherFT; FixedText aAddressFT; FixedText aISBNFT; FixedText aChapterFT; FixedText aPagesFT; FixedLine aFirstFL; - + FixedText aEditorFT; FixedText aEditionFT; - + FixedText aBooktitleFT; FixedText aVolumeFT; FixedText aHowpublishedFT; - + FixedText aOrganizationsFT; FixedText aInstitutionFT; FixedText aSchoolFT; - + FixedText aReportTypeFT; FixedText aMonthFT; FixedLine aSecondFL; - + FixedText aJournalFT; FixedText aNumberFT; FixedText aSeriesFT; - + FixedText aAnnoteFT; FixedText aNoteFT; FixedText aURLFT; FixedLine aThirdFL; FixedText aCustom1FT; - FixedText aCustom2FT; - FixedText aCustom3FT; - FixedText aCustom4FT; - FixedText aCustom5FT; + FixedText aCustom2FT; + FixedText aCustom3FT; + FixedText aCustom4FT; + FixedText aCustom5FT; - ScrollBar aHoriScroll; - ScrollBar aVertScroll; + ScrollBar aHoriScroll; + ScrollBar aVertScroll; - FixedText* aFixedTexts[ FIELD_COUNT ]; - sal_Int16 nFT2CtrlMap[ FIELD_COUNT ]; + FixedText* aFixedTexts[ FIELD_COUNT ]; + sal_Int16 nFT2CtrlMap[ FIELD_COUNT ]; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > aControls[ FIELD_COUNT ]; - Size aStdSize; - Point aBasePos; + Size aStdSize; + Point aBasePos; - String aBibTypeArr[ TYPE_COUNT ]; - String sErrorPrefix; - String sTableErrorString; + String aBibTypeArr[ TYPE_COUNT ]; + String sErrorPrefix; + String sTableErrorString; - String sTypeColumnName; + String sTypeColumnName; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > xCtrlContnr; @@ -133,49 +133,49 @@ class BibGeneralPage: public BibGeneralPageBaseClass, public BibTabPage xPosListener; - BibDataManager* pDatMan; + BibDataManager* pDatMan; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel > AddXControl( const String& rName, Point aPos, Size aSize, sal_uInt16 nHelpId, sal_Int16& rIndex ); - void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, + void AddControlWithError( const rtl::OUString& rColumnName, const Point& rPos, const Size& rSize, String& rErrorString, String aColumnUIName, sal_uInt16 nHelpId, sal_uInt16 nIndexInFTArray ); - void AdjustScrollbars(); + void AdjustScrollbars(); DECL_LINK( ScrollHdl, ScrollBar* ); protected: - virtual void Resize(); - void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts + virtual void Resize(); + void InitFixedTexts( void ); // create mnemonics and set text an all fixed texts public: BibGeneralPage(Window* pParent, BibDataManager* pDatMan); - virtual ~BibGeneralPage(); + virtual ~BibGeneralPage(); - inline const String& GetErrorString() const; + inline const String& GetErrorString() const; inline const ::com::sun::star::uno::Reference< ::com::sun::star::form::XBoundComponent >& GetTypeListBoxModel() const; inline const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& GetControlContainer() const; - inline BibDataManager* GetDataManager(); + inline BibDataManager* GetDataManager(); - void CommitActiveControl(); + void CommitActiveControl(); - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( com::sun::star::uno::RuntimeException ); - void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException ); - void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException ); + void SAL_CALL focusGained( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException ); + void SAL_CALL focusLost( const ::com::sun::star::awt::FocusEvent& e ) throw( com::sun::star::uno::RuntimeException ); - void RemoveListeners(); + void RemoveListeners(); - virtual void GetFocus(); + virtual void GetFocus(); - virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled + virtual BOOL HandleShortCutKey( const KeyEvent& rKeyEvent ); // returns true, if key was handled }; diff --git a/extensions/source/bibliography/hidother.src b/extensions/source/bibliography/hidother.src index 7517961645e3..57028fb426e1 100644 --- a/extensions/source/bibliography/hidother.src +++ b/extensions/source/bibliography/hidother.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,35 +27,35 @@ #include "bibliography.hrc" -hidspecial HID_BIB_IDENTIFIER_POS { HelpID = HID_BIB_IDENTIFIER_POS ; }; -hidspecial HID_BIB_AUTHORITYTYPE_POS { HelpID = HID_BIB_AUTHORITYTYPE_POS ; }; -hidspecial HID_BIB_AUTHOR_POS { HelpID = HID_BIB_AUTHOR_POS ; }; -hidspecial HID_BIB_TITLE_POS { HelpID = HID_BIB_TITLE_POS ; }; -hidspecial HID_BIB_YEAR_POS { HelpID = HID_BIB_YEAR_POS ; }; -hidspecial HID_BIB_ISBN_POS { HelpID = HID_BIB_ISBN_POS ; }; -hidspecial HID_BIB_BOOKTITLE_POS { HelpID = HID_BIB_BOOKTITLE_POS ; }; -hidspecial HID_BIB_CHAPTER_POS { HelpID = HID_BIB_CHAPTER_POS ; }; -hidspecial HID_BIB_EDITION_POS { HelpID = HID_BIB_EDITION_POS ; }; -hidspecial HID_BIB_EDITOR_POS { HelpID = HID_BIB_EDITOR_POS ; }; -hidspecial HID_BIB_HOWPUBLISHED_POS { HelpID = HID_BIB_HOWPUBLISHED_POS ; }; -hidspecial HID_BIB_INSTITUTION_POS { HelpID = HID_BIB_INSTITUTION_POS ; }; -hidspecial HID_BIB_JOURNAL_POS { HelpID = HID_BIB_JOURNAL_POS ; }; -hidspecial HID_BIB_MONTH_POS { HelpID = HID_BIB_MONTH_POS ; }; -hidspecial HID_BIB_NOTE_POS { HelpID = HID_BIB_NOTE_POS ; }; -hidspecial HID_BIB_ANNOTE_POS { HelpID = HID_BIB_ANNOTE_POS ; }; -hidspecial HID_BIB_NUMBER_POS { HelpID = HID_BIB_NUMBER_POS ; }; -hidspecial HID_BIB_ORGANIZATIONS_POS { HelpID = HID_BIB_ORGANIZATIONS_POS ; }; -hidspecial HID_BIB_PAGES_POS { HelpID = HID_BIB_PAGES_POS ; }; -hidspecial HID_BIB_PUBLISHER_POS { HelpID = HID_BIB_PUBLISHER_POS ; }; -hidspecial HID_BIB_ADDRESS_POS { HelpID = HID_BIB_ADDRESS_POS ; }; -hidspecial HID_BIB_SCHOOL_POS { HelpID = HID_BIB_SCHOOL_POS ; }; -hidspecial HID_BIB_SERIES_POS { HelpID = HID_BIB_SERIES_POS ; }; -hidspecial HID_BIB_REPORTTYPE_POS { HelpID = HID_BIB_REPORTTYPE_POS ; }; -hidspecial HID_BIB_VOLUME_POS { HelpID = HID_BIB_VOLUME_POS ; }; -hidspecial HID_BIB_URL_POS { HelpID = HID_BIB_URL_POS ; }; -hidspecial HID_BIB_CUSTOM1_POS { HelpID = HID_BIB_CUSTOM1_POS ; }; -hidspecial HID_BIB_CUSTOM2_POS { HelpID = HID_BIB_CUSTOM2_POS ; }; -hidspecial HID_BIB_CUSTOM3_POS { HelpID = HID_BIB_CUSTOM3_POS ; }; -hidspecial HID_BIB_CUSTOM4_POS { HelpID = HID_BIB_CUSTOM4_POS ; }; -hidspecial HID_BIB_CUSTOM5_POS { HelpID = HID_BIB_CUSTOM5_POS ; }; +hidspecial HID_BIB_IDENTIFIER_POS { HelpID = HID_BIB_IDENTIFIER_POS ; }; +hidspecial HID_BIB_AUTHORITYTYPE_POS { HelpID = HID_BIB_AUTHORITYTYPE_POS ; }; +hidspecial HID_BIB_AUTHOR_POS { HelpID = HID_BIB_AUTHOR_POS ; }; +hidspecial HID_BIB_TITLE_POS { HelpID = HID_BIB_TITLE_POS ; }; +hidspecial HID_BIB_YEAR_POS { HelpID = HID_BIB_YEAR_POS ; }; +hidspecial HID_BIB_ISBN_POS { HelpID = HID_BIB_ISBN_POS ; }; +hidspecial HID_BIB_BOOKTITLE_POS { HelpID = HID_BIB_BOOKTITLE_POS ; }; +hidspecial HID_BIB_CHAPTER_POS { HelpID = HID_BIB_CHAPTER_POS ; }; +hidspecial HID_BIB_EDITION_POS { HelpID = HID_BIB_EDITION_POS ; }; +hidspecial HID_BIB_EDITOR_POS { HelpID = HID_BIB_EDITOR_POS ; }; +hidspecial HID_BIB_HOWPUBLISHED_POS { HelpID = HID_BIB_HOWPUBLISHED_POS ; }; +hidspecial HID_BIB_INSTITUTION_POS { HelpID = HID_BIB_INSTITUTION_POS ; }; +hidspecial HID_BIB_JOURNAL_POS { HelpID = HID_BIB_JOURNAL_POS ; }; +hidspecial HID_BIB_MONTH_POS { HelpID = HID_BIB_MONTH_POS ; }; +hidspecial HID_BIB_NOTE_POS { HelpID = HID_BIB_NOTE_POS ; }; +hidspecial HID_BIB_ANNOTE_POS { HelpID = HID_BIB_ANNOTE_POS ; }; +hidspecial HID_BIB_NUMBER_POS { HelpID = HID_BIB_NUMBER_POS ; }; +hidspecial HID_BIB_ORGANIZATIONS_POS { HelpID = HID_BIB_ORGANIZATIONS_POS ; }; +hidspecial HID_BIB_PAGES_POS { HelpID = HID_BIB_PAGES_POS ; }; +hidspecial HID_BIB_PUBLISHER_POS { HelpID = HID_BIB_PUBLISHER_POS ; }; +hidspecial HID_BIB_ADDRESS_POS { HelpID = HID_BIB_ADDRESS_POS ; }; +hidspecial HID_BIB_SCHOOL_POS { HelpID = HID_BIB_SCHOOL_POS ; }; +hidspecial HID_BIB_SERIES_POS { HelpID = HID_BIB_SERIES_POS ; }; +hidspecial HID_BIB_REPORTTYPE_POS { HelpID = HID_BIB_REPORTTYPE_POS ; }; +hidspecial HID_BIB_VOLUME_POS { HelpID = HID_BIB_VOLUME_POS ; }; +hidspecial HID_BIB_URL_POS { HelpID = HID_BIB_URL_POS ; }; +hidspecial HID_BIB_CUSTOM1_POS { HelpID = HID_BIB_CUSTOM1_POS ; }; +hidspecial HID_BIB_CUSTOM2_POS { HelpID = HID_BIB_CUSTOM2_POS ; }; +hidspecial HID_BIB_CUSTOM3_POS { HelpID = HID_BIB_CUSTOM3_POS ; }; +hidspecial HID_BIB_CUSTOM4_POS { HelpID = HID_BIB_CUSTOM4_POS ; }; +hidspecial HID_BIB_CUSTOM5_POS { HelpID = HID_BIB_CUSTOM5_POS ; }; hidspecial HID_BIB_DB_GRIDCTRL { HelpID = HID_BIB_DB_GRIDCTRL ; }; diff --git a/extensions/source/bibliography/loadlisteneradapter.cxx b/extensions/source/bibliography/loadlisteneradapter.cxx index ff71292c9e7f..928fb020ac4d 100644 --- a/extensions/source/bibliography/loadlisteneradapter.cxx +++ b/extensions/source/bibliography/loadlisteneradapter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,7 +144,7 @@ namespace bib m_pListener->_disposing( _rSource ); // disconnect the listener - if ( m_pListener ) // may have been reset whilest calling into _disposing + if ( m_pListener ) // may have been reset whilest calling into _disposing m_pListener->setAdapter( NULL ); } @@ -235,7 +235,7 @@ namespace bib } //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/extensions/source/bibliography/loadlisteneradapter.hxx b/extensions/source/bibliography/loadlisteneradapter.hxx index c37384e4d266..c35cb939b5b0 100644 --- a/extensions/source/bibliography/loadlisteneradapter.hxx +++ b/extensions/source/bibliography/loadlisteneradapter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,8 +49,8 @@ namespace bib friend class OComponentAdapterBase; private: - OComponentAdapterBase* m_pAdapter; - ::osl::Mutex& m_rMutex; + OComponentAdapterBase* m_pAdapter; + ::osl::Mutex& m_rMutex; protected: OComponentListener( ::osl::Mutex& _rMutex ) :m_pAdapter( NULL ) @@ -77,10 +77,10 @@ namespace bib private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xComponent; - OComponentListener* m_pListener; - sal_Int32 m_nLockCount; - sal_Bool m_bListening : 1; - sal_Bool m_bAutoRelease : 1; + OComponentListener* m_pListener; + sal_Int32 m_nLockCount; + sal_Bool m_bListening : 1; + sal_Bool m_bAutoRelease : 1; // impl method for dispose - virtual, 'cause you at least need to remove the listener from the broadcaster virtual void disposing() = 0; @@ -88,11 +88,11 @@ namespace bib protected: // attribute access for derivees const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& - getComponent() const { return m_xComponent; } - OComponentListener* getListener() { return m_pListener; } + getComponent() const { return m_xComponent; } + OComponentListener* getListener() { return m_pListener; } // to be called by derivees which started listening at the component - virtual void startComponentListening() = 0; + virtual void startComponentListening() = 0; virtual ~OComponentAdapterBase(); @@ -113,7 +113,7 @@ namespace bib // helper /// get the lock count - sal_Int32 locked() const { return m_nLockCount; } + sal_Int32 locked() const { return m_nLockCount; } /// dispose the object - stop listening and such void dispose(); @@ -144,17 +144,17 @@ namespace bib //===================================================================== //= OLoadListenerAdapter //===================================================================== - typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base; + typedef ::cppu::WeakImplHelper1< ::com::sun::star::form::XLoadListener > OLoadListenerAdapter_Base; class OLoadListenerAdapter :public OLoadListenerAdapter_Base ,public OComponentAdapterBase { protected: - OLoadListener* getLoadListener( ) { return static_cast< OLoadListener* >( getListener() ); } + OLoadListener* getLoadListener( ) { return static_cast< OLoadListener* >( getListener() ); } protected: - virtual void disposing(); - virtual void startComponentListening(); + virtual void disposing(); + virtual void startComponentListening(); public: OLoadListenerAdapter( @@ -179,7 +179,7 @@ namespace bib }; //......................................................................... -} // namespace bib +} // namespace bib //......................................................................... #endif // EXTENSIONS_BIB_LOADLISTENERADAPTER_HXX diff --git a/extensions/source/bibliography/menu.src b/extensions/source/bibliography/menu.src index 0ccc8a1c7f41..6b8adc355fb1 100644 --- a/extensions/source/bibliography/menu.src +++ b/extensions/source/bibliography/menu.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ /* -The menu bar resource has become obsolete. You find the menu bar definition +The menu bar resource has become obsolete. You find the menu bar definition now at: <project>/uiconfig/sbibliography/menubar/menubar.xml */ diff --git a/extensions/source/bibliography/sections.hrc b/extensions/source/bibliography/sections.hrc index 5d146e04ce53..2488f4ed62df 100644 --- a/extensions/source/bibliography/sections.hrc +++ b/extensions/source/bibliography/sections.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,82 +28,82 @@ #include "bib.hrc" //General -/*#define FT_FIRST_MIDDLE 1 -#define ED_FIRST 2 -#define ED_MIDDLE 3 -#define FT_NAME_SUFFIX 4 -#define ED_NAME 5 -#define CB_SUFFIX 6 -#define ED_INITIALS 8 -#define FT_COMPANY 9 -#define ED_COMPANY 10 -#define FT_DEPARTMENT 11 -#define ED_DEPARTMENT 12 -#define FT_SALUTATION 13 -#define CB_SALUTATION 14 -#define FT_SHOWNNAME 15 -#define ED_SHOWNNAME 16*/ -#define FT_IDENTIFIER 1 -#define FT_AUTHTYPE 2 -#define FT_AUTHOR 3 -#define FT_YEAR 4 -#define FT_ISBN 5 +/*#define FT_FIRST_MIDDLE 1 +#define ED_FIRST 2 +#define ED_MIDDLE 3 +#define FT_NAME_SUFFIX 4 +#define ED_NAME 5 +#define CB_SUFFIX 6 +#define ED_INITIALS 8 +#define FT_COMPANY 9 +#define ED_COMPANY 10 +#define FT_DEPARTMENT 11 +#define ED_DEPARTMENT 12 +#define FT_SALUTATION 13 +#define CB_SALUTATION 14 +#define FT_SHOWNNAME 15 +#define ED_SHOWNNAME 16*/ +#define FT_IDENTIFIER 1 +#define FT_AUTHTYPE 2 +#define FT_AUTHOR 3 +#define FT_YEAR 4 +#define FT_ISBN 5 -#define FT_MONTH 6 +#define FT_MONTH 6 -#define FT_PUBLISHER 8 +#define FT_PUBLISHER 8 -#define FT_ADDRESS 9 -#define FT_ANNOTE 10 -#define FT_BOOKTITLE 11 -#define FT_CHAPTER 12 -#define FT_EDITION 13 -#define FT_EDITOR 14 -#define FT_HOWPUBLISHED 15 -#define FT_INSTITUTION 16 -#define FT_JOURNAL 17 -#define FT_NOTE 18 -#define FT_NUMBER 19 -#define FT_ORGANIZATION 20 -#define FT_PAGE 21 -#define FT_SCHOOL 22 -#define FT_SERIES 23 -#define FT_TITLE 24 -#define FT_REPORT 25 -#define FT_VOLUME 26 -#define FT_URL 27 -#define FT_CUSTOM1 28 -#define FT_CUSTOM2 29 -#define FT_CUSTOM3 30 -#define FT_CUSTOM4 31 -#define FT_CUSTOM5 32 -#define ST_ERROR_PREFIX 33 +#define FT_ADDRESS 9 +#define FT_ANNOTE 10 +#define FT_BOOKTITLE 11 +#define FT_CHAPTER 12 +#define FT_EDITION 13 +#define FT_EDITOR 14 +#define FT_HOWPUBLISHED 15 +#define FT_INSTITUTION 16 +#define FT_JOURNAL 17 +#define FT_NOTE 18 +#define FT_NUMBER 19 +#define FT_ORGANIZATION 20 +#define FT_PAGE 21 +#define FT_SCHOOL 22 +#define FT_SERIES 23 +#define FT_TITLE 24 +#define FT_REPORT 25 +#define FT_VOLUME 26 +#define FT_URL 27 +#define FT_CUSTOM1 28 +#define FT_CUSTOM2 29 +#define FT_CUSTOM3 30 +#define FT_CUSTOM4 31 +#define FT_CUSTOM5 32 +#define ST_ERROR_PREFIX 33 #define FL_1 34 #define FL_2 35 #define FL_3 36 //Business Address -#define FT_OFFICE 1 -#define FT_STREET 2 -#define FT_CITY 3 -#define FT_STATE 4 -#define FT_COUNTRY 5 -#define FT_ZIP 6 -#define ED_OFFICE 7 -#define ED_STREET 8 -#define ED_CITY 9 -#define ED_STATE 10 -#define ED_COUNTRY 11 -#define ED_ZIP 12 -#define ED_POBOX 13 +#define FT_OFFICE 1 +#define FT_STREET 2 +#define FT_CITY 3 +#define FT_STATE 4 +#define FT_COUNTRY 5 +#define FT_ZIP 6 +#define ED_OFFICE 7 +#define ED_STREET 8 +#define ED_CITY 9 +#define ED_STATE 10 +#define ED_COUNTRY 11 +#define ED_ZIP 12 +#define ED_POBOX 13 //Popup SectionControl -#define PU_INSERT 1 -#define PU_REMOVE 2 -#define PU_CHG_NAME 3 +#define PU_INSERT 1 +#define PU_REMOVE 2 +#define PU_CHG_NAME 3 -#define ST_TYPE_ARTICLE 40 +#define ST_TYPE_ARTICLE 40 #define ST_TYPE_BOOK 41 #define ST_TYPE_BOOKLET 42 #define ST_TYPE_CONFERENCE 43 diff --git a/extensions/source/bibliography/sections.src b/extensions/source/bibliography/sections.src index 19501bd0e62a..3f7fe83d5fba 100644 --- a/extensions/source/bibliography/sections.src +++ b/extensions/source/bibliography/sections.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,11 +31,11 @@ #define FT_POS 12 #define FTSIZE_LEFT 88 -#define ED_POS_LEFT FT_POS+FTSIZE_LEFT+1 +#define ED_POS_LEFT FT_POS+FTSIZE_LEFT+1 #define ED_SIZE 70 -#define ED_POS_LEFT2 ED_POS_LEFT + ED_SIZE +1 -#define FT_POS_MIDDLE ED_POS_LEFT2 + 5 -#define FT_POS_RIGHT FT_POS_MIDDLE + FT_POS_MIDDLE - FT_POS +#define ED_POS_LEFT2 ED_POS_LEFT + ED_SIZE +1 +#define FT_POS_MIDDLE ED_POS_LEFT2 + 5 +#define FT_POS_RIGHT FT_POS_MIDDLE + FT_POS_MIDDLE - FT_POS #define FL_POS 6 #define PAGE_WIDTH FT_POS_RIGHT + FTSIZE_LEFT + (FTSIZE_LEFT * 8 / 10) + FL_POS + 5 diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index 1cfb4726068d..dc801d27f808 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -91,7 +91,7 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta } }; -rtl::OUString BibToolBarListener::GetCommand() +rtl::OUString BibToolBarListener::GetCommand() { return aCommand; } @@ -166,7 +166,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) sal_uInt16 nID=pToolBar->InsertFilterItem(String(pStringArray[i])); if(pStringArray[i]==rEvt.FeatureDescriptor) { -// XubString aStr = rEvt.FeatureDescriptor; +// XubString aStr = rEvt.FeatureDescriptor; pToolBar->SelectFilterItem(nID); } } @@ -231,7 +231,7 @@ BibToolBar::BibToolBar(Window* pParent, Link aLink, WinBits nStyle): aLBSource.SetDropDownLineCount(9); aLBSource.Show(); aLBSource.SetSelectHdl(LINK( this, BibToolBar, SelHdl)); - + SvtMiscOptions().AddListenerLink( LINK( this, BibToolBar, OptionsChanged_Impl ) ); Application::AddEventListener( LINK( this, BibToolBar, SettingsChanged_Impl ) ); @@ -272,10 +272,10 @@ BibToolBar::~BibToolBar() void BibToolBar::InitListener() { - sal_uInt16 nCount=GetItemCount(); + sal_uInt16 nCount=GetItemCount(); uno::Reference< lang::XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory(); - uno::Reference< frame::XDispatch > xDisp(xController,UNO_QUERY); + uno::Reference< frame::XDispatch > xDisp(xController,UNO_QUERY); uno::Reference< util::XURLTransformer > xTrans ( xMgr->createInstance( C2U("com.sun.star.util.URLTransformer") ), UNO_QUERY ); if( xTrans.is() ) @@ -330,7 +330,7 @@ void BibToolBar::SetXController(const uno::Reference< frame::XController > & xCt void BibToolBar::Select() { - sal_uInt16 nId=GetCurItemId(); + sal_uInt16 nId=GetCurItemId(); if(nId!=TBC_BT_AUTOFILTER) { @@ -354,7 +354,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r { rtl::OUString aCommand = GetItemCommand(nId); - uno::Reference< frame::XDispatchProvider > xDSP( xController, UNO_QUERY ); + uno::Reference< frame::XDispatchProvider > xDSP( xController, UNO_QUERY ); if( xDSP.is() && aCommand.getLength()) { @@ -369,7 +369,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r xTrans->parseStrict( aURL ); - uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF ); + uno::Reference< frame::XDispatch > xDisp = xDSP->queryDispatch( aURL, rtl::OUString(), frame::FrameSearchFlag::SELF ); if ( xDisp.is() ) xDisp->dispatch( aURL, rArgs); @@ -380,7 +380,7 @@ void BibToolBar::SendDispatch(sal_uInt16 nId, const Sequence< PropertyValue >& r void BibToolBar::Click() { - sal_uInt16 nId=GetCurItemId(); + sal_uInt16 nId=GetCurItemId(); if(nId == TBC_BT_COL_ASSIGN ) { @@ -412,7 +412,7 @@ sal_uInt16 BibToolBar::InsertFilterItem(const XubString& aMenuEntry) return nMenuId; } -void BibToolBar::SelectFilterItem(sal_uInt16 nId) +void BibToolBar::SelectFilterItem(sal_uInt16 nId) { aPopupMenu.CheckItem(nId); nSelMenuItem=nId; @@ -497,7 +497,7 @@ IMPL_LINK( BibToolBar, SendSelHdl, Timer*,/*pT*/) Sequence<PropertyValue> aPropVal(1); PropertyValue* pPropertyVal = (PropertyValue*)aPropVal.getConstArray(); pPropertyVal[0].Name = C2U("DataSourceName"); - String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) ); + String aEntry( MnemonicGenerator::EraseAllMnemonicChars( aLBSource.GetSelectEntry() ) ); rtl::OUString aSelection = aEntry; pPropertyVal[0].Value <<= aSelection; SendDispatch(TBC_LB_SOURCE,aPropVal); @@ -510,7 +510,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) sal_uInt16 nId=GetCurItemId(); if(nId==TBC_BT_AUTOFILTER) { - EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) + EndSelection(); // vor SetDropMode (SetDropMode ruft SetItemImage) SetItemDown(TBC_BT_AUTOFILTER,sal_True); nId = aPopupMenu.Execute(this, GetItemRect(TBC_BT_AUTOFILTER)); @@ -542,7 +542,7 @@ IMPL_LINK( BibToolBar, MenuHdl, ToolBox*, /*pToolbox*/) return 0; } //----------------------------------------------------------------------------- -void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) +void BibToolBar::statusChanged(const frame::FeatureStateEvent& rEvent) throw( uno::RuntimeException ) { for(sal_uInt16 i = 0; i < aListenerArr.Count(); i++) @@ -579,7 +579,7 @@ IMPL_LINK( BibToolBar, OptionsChanged_Impl, void*, /*pVoid*/ ) SetOutStyle( nOutStyle ); bRebuildToolBar = sal_True; } - + if ( bRebuildToolBar ) RebuildToolbar(); @@ -597,7 +597,7 @@ IMPL_LINK( BibToolBar, SettingsChanged_Impl, void*, /*pVoid*/ ) nSymbolsSize = eSymbolsSize; RebuildToolbar(); } - + return 0L; } @@ -613,10 +613,10 @@ void BibToolBar::RebuildToolbar() void BibToolBar::ApplyImageList() { - ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? + ImageList& rList = ( nSymbolsSize == SFX_SYMBOLS_SIZE_SMALL ) ? ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aImgLstHC : aImgLst ) : ( GetSettings().GetStyleSettings().GetHighContrastMode() ? aBigImgLstHC : aBigImgLst ); - + SetItemImage(TBC_BT_AUTOFILTER , rList.GetImage(SID_FM_AUTOFILTER)); SetItemImage(TBC_BT_FILTERCRIT , rList.GetImage(SID_FM_FILTERCRIT)); SetItemImage(TBC_BT_REMOVEFILTER, rList.GetImage(SID_FM_REMOVE_FILTER_SORT )); diff --git a/extensions/source/bibliography/toolbar.hrc b/extensions/source/bibliography/toolbar.hrc index 05c81921e44d..7349bd2c2aae 100644 --- a/extensions/source/bibliography/toolbar.hrc +++ b/extensions/source/bibliography/toolbar.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -26,21 +26,21 @@ ************************************************************************/ #include "bib.hrc" -#define TBC_FT_SOURCE 1 -#define TBC_LB_SOURCE 2 -#define TBC_FT_QUERY 3 -#define TBC_ED_QUERY 4 -#define TBC_BT_AUTOFILTER 5 -#define TBC_BT_FILTERCRIT 6 -#define TBC_BT_REMOVEFILTER 7 -#define TBC_BT_NEWCARD 8 -#define TBC_BT_EDITCARD 9 -#define TBC_BT_REMOVECARD 10 -#define TBC_BT_INSERT 11 -#define TBC_BT_UPDATE 12 -#define TBC_BT_MAIL 13 -#define TBC_BT_URL 14 -#define TBC_BT_COL_ASSIGN 15 +#define TBC_FT_SOURCE 1 +#define TBC_LB_SOURCE 2 +#define TBC_FT_QUERY 3 +#define TBC_ED_QUERY 4 +#define TBC_BT_AUTOFILTER 5 +#define TBC_BT_FILTERCRIT 6 +#define TBC_BT_REMOVEFILTER 7 +#define TBC_BT_NEWCARD 8 +#define TBC_BT_EDITCARD 9 +#define TBC_BT_REMOVECARD 10 +#define TBC_BT_INSERT 11 +#define TBC_BT_UPDATE 12 +#define TBC_BT_MAIL 13 +#define TBC_BT_URL 14 +#define TBC_BT_COL_ASSIGN 15 #define TBC_BT_CHANGESOURCE 16 #define IL_TOOLBOX 17 #define ILH_TOOLBOX 18 diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index fe1f615d8c2c..07775e31f121 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,27 +48,27 @@ class BibToolBarListener: public cppu::WeakImplHelper1 < ::com::sun::star::frame { private: - sal_uInt16 nIndex; - rtl::OUString aCommand; + sal_uInt16 nIndex; + rtl::OUString aCommand; protected: - BibToolBar *pToolBar; + BibToolBar *pToolBar; public: BibToolBarListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibToolBarListener(); - rtl::OUString GetCommand(); + rtl::OUString GetCommand(); // ::com::sun::star::lang::XEventListener // we do not hold References to dispatches, so there is nothing to do on disposal - virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/) + virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& /*Source*/) throw( ::com::sun::star::uno::RuntimeException ){}; // ::com::sun::star::frame::XStatusListener - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -80,7 +80,7 @@ public: BibTBListBoxListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibTBListBoxListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -92,19 +92,19 @@ public: BibTBEditListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibTBEditListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); }; -class BibTBQueryMenuListener: public BibToolBarListener +class BibTBQueryMenuListener: public BibToolBarListener { public: BibTBQueryMenuListener(BibToolBar *pTB,rtl::OUString aStr,sal_uInt16 nId); ~BibTBQueryMenuListener(); - virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) + virtual void SAL_CALL statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); }; @@ -113,31 +113,31 @@ public: typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener>* BibToolBarListenerPtr; SV_DECL_PTRARR_DEL( BibToolBarListenerArr, BibToolBarListenerPtr, 4, 4 ) -class BibToolBar: public ToolBox +class BibToolBar: public ToolBox { private: - BibToolBarListenerArr aListenerArr; - ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController; - Timer aTimer; + BibToolBarListenerArr aListenerArr; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > xController; + Timer aTimer; // Timer aMenuTimer; ImageList aImgLst; ImageList aImgLstHC; ImageList aBigImgLst; ImageList aBigImgLstHC; - FixedText aFtSource; - ListBox aLBSource; - FixedText aFtQuery; - Edit aEdQuery; - PopupMenu aPopupMenu; - sal_uInt16 nMenuId; - sal_uInt16 nSelMenuItem; - rtl::OUString aQueryField; + FixedText aFtSource; + ListBox aLBSource; + FixedText aFtQuery; + Edit aEdQuery; + PopupMenu aPopupMenu; + sal_uInt16 nMenuId; + sal_uInt16 nSelMenuItem; + rtl::OUString aQueryField; Link aLayoutManager; sal_Int16 nSymbolsSize; sal_Int16 nOutStyle; - BibDataManager* pDatMan; + BibDataManager* pDatMan; DECL_LINK( SelHdl, ListBox* ); DECL_LINK( SendSelHdl, Timer* ); DECL_LINK( MenuHdl, ToolBox* ); @@ -146,13 +146,13 @@ class BibToolBar: public ToolBox void ApplyImageList(); void RebuildToolbar(); - + protected: void DataChanged( const DataChangedEvent& rDCEvt ); void InitListener(); - virtual void Select(); - virtual void Click(); + virtual void Select(); + virtual void Click(); long PreNotify( NotifyEvent& rNEvt ); @@ -161,26 +161,26 @@ class BibToolBar: public ToolBox BibToolBar(Window* pParent, Link aLink, WinBits nStyle = WB_3DLOOK ); ~BibToolBar(); - void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); + void SetXController(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > &); - void ClearSourceList(); - void UpdateSourceList(sal_Bool bFlag=sal_True); - void EnableSourceList(sal_Bool bFlag=sal_True); - void InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND ); - void SelectSourceEntry(const XubString& ); + void ClearSourceList(); + void UpdateSourceList(sal_Bool bFlag=sal_True); + void EnableSourceList(sal_Bool bFlag=sal_True); + void InsertSourceEntry(const XubString&,sal_uInt16 nPos=LISTBOX_APPEND ); + void SelectSourceEntry(const XubString& ); - void EnableQuery(sal_Bool bFlag=sal_True); - void SetQueryString(const XubString& ); + void EnableQuery(sal_Bool bFlag=sal_True); + void SetQueryString(const XubString& ); void AdjustToolBox(); - void ClearFilterMenu(); - sal_uInt16 InsertFilterItem(const XubString& ); - void SelectFilterItem(sal_uInt16 nId); + void ClearFilterMenu(); + sal_uInt16 InsertFilterItem(const XubString& ); + void SelectFilterItem(sal_uInt16 nId); - void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) + void statusChanged(const ::com::sun::star::frame::FeatureStateEvent& Event) throw( ::com::sun::star::uno::RuntimeException ); - void SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;} + void SetDatMan(BibDataManager& rDatMan) {pDatMan = &rDatMan;} void SendDispatch(sal_uInt16 nId, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArgs); }; diff --git a/extensions/source/bibliography/toolbar.src b/extensions/source/bibliography/toolbar.src index b8a604587bc4..9016a4570b8b 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -28,7 +28,7 @@ #include "bibliography.hrc" #include "toolbar.hrc" -#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; +#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; }; ToolBox RID_BIB_TOOLBAR { @@ -109,7 +109,7 @@ ToolBox RID_BIB_TOOLBAR { Identifier = TBC_BT_COL_ASSIGN ; HelpId = HID_BIB_MAPPINGDLG; -// Command = ".uno:Bib/Mapping" ; +// Command = ".uno:Bib/Mapping" ; // ItemBitmap = Bitmap { File = "sc10711.bmp" ; }; Text [ en-US ] = "Column Arrangement"; }; diff --git a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml index a1924145b4cf..817473af0e73 100644 --- a/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml +++ b/extensions/source/bibliography/uiconfig/sbibliography/menubar/menubar.xml @@ -85,7 +85,6 @@ <menu:menuitem menu:id=".uno:ExtendedHelp"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:ShowLicense"/> - <menu:menuitem menu:id=".uno:OnlineRegistrationDlg"/> <menu:menuseparator/> <menu:menuitem menu:id=".uno:About"/> </menu:menupopup> |