diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-19 12:24:29 +0200 |
commit | 92667c8edbaee9a252b1d5d221eb62849f76697c (patch) | |
tree | 8f1d329f2259b7d5bff054bc14d0965637df6961 /sfx2/source/inc/templdgi.hxx | |
parent | baecdfb578cb7bc992944857ad4d8882ef7e842c (diff) | |
parent | 48b4a99ce2451f1ddf2e8e128bbfcd6683072999 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
connectivity/source/cpool/Zregistration.cxx
connectivity/source/drivers/evoab/LCatalog.cxx
connectivity/source/drivers/evoab/LColumnAlias.cxx
connectivity/source/drivers/evoab/LColumnAlias.hxx
connectivity/source/drivers/evoab/LColumns.cxx
connectivity/source/drivers/evoab/LColumns.hxx
connectivity/source/drivers/evoab/LConfigAccess.cxx
connectivity/source/drivers/evoab/LConfigAccess.hxx
connectivity/source/drivers/evoab/LConnection.cxx
connectivity/source/drivers/evoab/LConnection.hxx
connectivity/source/drivers/evoab/LDatabaseMetaData.cxx
connectivity/source/drivers/evoab/LDatabaseMetaData.hxx
connectivity/source/drivers/evoab/LDriver.cxx
connectivity/source/drivers/evoab/LDriver.hxx
connectivity/source/drivers/evoab/LFolderList.cxx
connectivity/source/drivers/evoab/LFolderList.hxx
connectivity/source/drivers/evoab/LNoException.cxx
connectivity/source/drivers/evoab/LPreparedStatement.cxx
connectivity/source/drivers/evoab/LPreparedStatement.hxx
connectivity/source/drivers/evoab/LResultSet.cxx
connectivity/source/drivers/evoab/LResultSet.hxx
connectivity/source/drivers/evoab/LServices.cxx
connectivity/source/drivers/evoab/LStatement.cxx
connectivity/source/drivers/evoab/LStatement.hxx
connectivity/source/drivers/evoab/LTable.cxx
connectivity/source/drivers/evoab/LTable.hxx
connectivity/source/drivers/evoab/LTables.cxx
connectivity/source/drivers/evoab/LTables.hxx
connectivity/source/drivers/evoab/evoab.xml
connectivity/source/drivers/evoab/makefile.mk
editeng/Library_editeng.mk
framework/Library_fwe.mk
framework/test/test.cxx
idl/prj/d.lst
idl/util/idlpch.cxx
linguistic/Makefile
linguistic/Module_linguistic.mk
linguistic/inc/linguistic/lngdllapi.h
linguistic/inc/linguistic/lngprophelp.hxx
linguistic/inc/linguistic/misc.hxx
linguistic/prj/build.lst
linguistic/prj/d.lst
linguistic/qa/unoapi/Test.java
linguistic/source/grammarchecker.cxx
linguistic/source/grammarchecker.hxx
linguistic/source/hyphdta.cxx
linguistic/source/lngprophelp.cxx
linguistic/source/makefile.mk
linguistic/source/spelldta.cxx
sfx2/Library_qstart.mk
sfx2/Library_sfx.mk
sfx2/inc/sfx2/qswin32.h
sfx2/prj/build.lst
sfx2/qa/cppunit/makefile.mk
xmlscript/inc/xmlscript/xcrdllapi.h
xmlscript/prj/d.lst
xmlscript/util/makefile.mk
Diffstat (limited to 'sfx2/source/inc/templdgi.hxx')
-rw-r--r-- | sfx2/source/inc/templdgi.hxx | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 64c9b539d2be..aa4c7a05776b 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,15 +30,9 @@ class SfxTemplateControllerItem; -#ifndef _BUTTON_HXX //autogen #include <vcl/button.hxx> -#endif -#ifndef _TOOLBOX_HXX //autogen #include <vcl/toolbox.hxx> -#endif -#ifndef _LSTBOX_HXX //autogen #include <vcl/lstbox.hxx> -#endif #include <svl/lstner.hxx> #include <svtools/svtreebx.hxx> #include <svl/eitem.hxx> @@ -55,6 +50,7 @@ class SfxStyleFamilies; class SfxStyleFamilyItem; class SfxTemplateItem; class SfxBindings; +class SfxStyleSheetBase; class SfxStyleSheetBasePool; class SvTreeListBox ; class StyleTreeListBox_Impl; @@ -166,9 +162,9 @@ protected: ListBox aFilterLb; Size aSize; - sal_uInt16 nActFamily; // Id in der ToolBox = Position - 1 + sal_uInt16 nActFamily; // Id in the ToolBox = Position - 1 sal_uInt16 nActFilter; // FilterIdx - sal_uInt16 nAppFilter; // Filter, den die Applikation gesetzt hat (fuer automatisch) + sal_uInt16 nAppFilter; // Filter, which has set the application (for automatic) sal_Bool bDontUpdate :1, bIsWater :1, @@ -213,7 +209,7 @@ protected: void UpdateStyles_Impl(sal_uInt16 nFlags); const SfxStyleFamilyItem* GetFamilyItem_Impl() const; - sal_Bool IsInitialized() { return nActFamily != 0xffff; } + sal_Bool IsInitialized() const { return nActFamily != 0xffff; } void ResetFocus(); void EnableDelete(); void Initialize(); @@ -223,13 +219,14 @@ protected: void SetWaterCanState( const SfxBoolItem* pItem ); void SelectStyle( const String& rStyle ); - sal_Bool HasSelectedStyle() const; + sal_Bool HasSelectedStyle() const; + SfxStyleSheetBase *GetSelectedStyle() const; void FillTreeBox(); void Update_Impl(); void UpdateFamily_Impl(); - // In welchem FamilyState muss ich nachsehen, um die Info der i-ten - // Family in der pStyleFamilies zu bekommen. + // In which FamilyState do I have to look , in order to get the + // information of the ith Family in the pStyleFamilies. sal_uInt16 StyleNrToInfoOffset( sal_uInt16 i ); sal_uInt16 InfoOffsetToStyleNr( sal_uInt16 i ); @@ -274,14 +271,11 @@ public: // normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus virtual PopupMenu* CreateContextMenu( void ); - // Rechnet von den SFX_STYLE_FAMILY Ids auf 1-5 um + // converts from SFX_STYLE_FAMILY Ids to 1-5 static sal_uInt16 SfxFamilyIdToNId( SfxStyleFamily nFamily ); void SetAutomaticFilter(); }; -/* -----------------10.12.2003 11:42----------------- - - --------------------------------------------------*/ class DropToolBox_Impl : public ToolBox, public DropTargetHelper { @@ -392,3 +386,4 @@ friend class SfxTemplateCatalog; #endif // #ifndef _SFX_TEMPDLGI_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |