summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/tplcitem.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/dialog/tplcitem.cxx')
-rwxr-xr-x[-rw-r--r--]sfx2/source/dialog/tplcitem.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index f74b892131c3..5a831b162cf2 100644..100755
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -36,7 +36,7 @@
#include <sfx2/templdlg.hxx>
#include <sfx2/bindings.hxx>
-#include "tplpitem.hxx"
+#include "sfx2/tplpitem.hxx"
#include "tplcitem.hxx"
#include "templdgi.hxx"
@@ -48,7 +48,7 @@
// Konstruktor
SfxTemplateControllerItem::SfxTemplateControllerItem(
- USHORT nSlotId, // ID
+ sal_uInt16 nSlotId, // ID
SfxCommonTemplateDialog_Impl &rDlg, // Controller-Instanz, dem dieses Item zugeordnet ist.
SfxBindings &rBindings):
SfxControllerItem(nSlotId, rBindings),
@@ -69,7 +69,7 @@ SfxTemplateControllerItem::~SfxTemplateControllerItem()
// Benachrichtigung "uber Status"anderung; wird an den
// im Konstruktor "ubergebenen Controller propagiert
-void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
+void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pItem )
{
switch(nSID)
@@ -89,9 +89,9 @@ void SfxTemplateControllerItem::StateChanged( USHORT nSID, SfxItemState eState,
DBG_ASSERT(pStateItem != 0, "SfxTemplateItem erwartet");
rTemplateDlg.SetFamilyState( GetId(), pStateItem );
}
- BOOL bDisable = eState == SFX_ITEM_DISABLED;
+ sal_Bool bDisable = eState == SFX_ITEM_DISABLED;
// Familie Disablen
- USHORT nFamily = 0;
+ sal_uInt16 nFamily = 0;
switch( GetId())
{
case SID_STYLE_FAMILY1:
@@ -171,7 +171,7 @@ IMPL_STATIC_LINK(SfxTemplateControllerItem, SetWaterCanStateHdl_Impl,
{
case 0 :
case 1 :
- pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? TRUE : FALSE);
+ pState = new SfxBoolItem(SID_STYLE_WATERCAN, pThis->nWaterCanState ? sal_True : sal_False);
break;
}
pThis->rTemplateDlg.SetWaterCanState(pState);