summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sfx2/source/view/viewfrm.cxx48
-rw-r--r--sfx2/source/view/viewsh.cxx8
-rw-r--r--svx/sdi/svx.sdi87
-rw-r--r--svx/sdi/svxitems.sdi12
-rw-r--r--svx/source/items/frmitems.cxx18
5 files changed, 147 insertions, 26 deletions
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index b28b91b0beb0..bd798d695441 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewfrm.cxx,v $
*
- * $Revision: 1.49 $
+ * $Revision: 1.50 $
*
- * last change: $Author: mba $ $Date: 2002-06-14 07:37:43 $
+ * last change: $Author: mba $ $Date: 2002-06-27 08:20:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -3442,6 +3442,8 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
: !pTbxCfg->IsStatusBarVisible();
pTbxCfg->SetStatusBarVisible( bShow );
GetFrame()->GetWorkWindow_Impl()->UpdateObjectBars_Impl();
+ if ( !pShowItem )
+ rReq.AppendItem( SfxBoolItem( SID_TOGGLESTATUSBAR, bShow ) );
rReq.Done();
break;
}
@@ -3460,8 +3462,13 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
pWork->ShowFullScreenMode( bNewFullScreenMode );
pWork->SetMenuBarMode( bNewFullScreenMode ? MENUBAR_MODE_HIDE : MENUBAR_MODE_NORMAL );
GetFrame()->GetWorkWindow_Impl()->SetFullScreen_Impl( bNewFullScreenMode );
+ if ( !pItem )
+ rReq.AppendItem( SfxBoolItem( SID_WIN_FULLSCREEN, bNewFullScreenMode ) );
+ rReq.Done();
}
}
+ else
+ rReq.Ignore();
GetDispatcher()->Update_Impl( TRUE );
break;
@@ -3553,12 +3560,26 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
// Parameter auswerten
USHORT nSID = rReq.GetSlot();
+ SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, FALSE);
if ( nSID == SID_VIEW_DATA_SOURCE_BROWSER )
{
Reference < XFrame > xFrame = GetFrame()->GetTopFrame()->GetFrameInterface();
Reference < XFrame > xBeamer( xFrame->findFrame( DEFINE_CONST_UNICODE("_beamer"), FrameSearchFlag::CHILDREN ) );
- if ( xBeamer.is() )
+ BOOL bShow = FALSE;
+ BOOL bHasChild = xBeamer.is();
+ bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
+ if ( pShowItem )
+ {
+ if( bShow == bHasChild )
+ return;
+ }
+ else
+ rReq.AppendItem( SfxBoolItem( nSID, bShow ) );
+
+ if ( !bShow )
+ {
SetChildWindow( SID_BROWSER, FALSE );
+ }
else
{
::com::sun::star::util::URL aTargetURL;
@@ -3580,10 +3601,10 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
}
}
+ rReq.Done();
return;
}
- SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, FALSE);
BOOL bShow = FALSE;
BOOL bHasChild = HasChildWindow(nSID);
bShow = pShowItem ? pShowItem->GetValue() : !bHasChild;
@@ -3596,9 +3617,7 @@ void SfxViewFrame::ChildWindowExecute( SfxRequest &rReq )
GetDispatcher()->Update_Impl( TRUE );
// ggf. recorden
- if ( !rReq.IsAPI() )
- rReq.AppendItem( SfxBoolItem( nSID, bShow ) );
-
+ rReq.AppendItem( SfxBoolItem( nSID, bShow ) );
rReq.Done();
}
@@ -3657,6 +3676,7 @@ void SfxViewFrame::ToolboxExec_Impl( SfxRequest &rReq )
// Object-Bar-Id ermitteln
sal_uInt16 nSID = rReq.GetSlot(), nTbxID;
SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, nSID, sal_False);
+ BOOL bShow;
if ( nSID == SID_TOGGLE_MENUBAR )
{
@@ -3664,7 +3684,7 @@ void SfxViewFrame::ToolboxExec_Impl( SfxRequest &rReq )
SfxTopFrame *pTop = pTopView ? pTopView->GetTopFrame_Impl() : NULL;
if ( pTop )
{
- sal_Bool bShow = pShowItem ? pShowItem->GetValue() : ( pTop->GetMenuBar_Impl() == 0 );
+ bShow = pShowItem ? pShowItem->GetValue() : ( pTop->GetMenuBar_Impl() == 0 );
pTop->SetMenuBarOn_Impl( bShow );
GetDispatcher()->Update_Impl(sal_True);
}
@@ -3687,14 +3707,10 @@ void SfxViewFrame::ToolboxExec_Impl( SfxRequest &rReq )
}
// Parameter auswerten
-#if SUPD<635
- SfxToolBoxConfig *pTbxConfig = SfxToolBoxConfig::GetOrCreate();
-#else
SfxToolBoxConfig *pTbxConfig = GetObjectShell()->GetToolBoxConfig_Impl();
-#endif
// ausfuehren
- sal_Bool bShow = pShowItem ? pShowItem->GetValue() : !pTbxConfig->IsToolBoxPositionVisible(nTbxID);
+ bShow = pShowItem ? pShowItem->GetValue() : !pTbxConfig->IsToolBoxPositionVisible(nTbxID);
pTbxConfig->SetToolBoxPositionVisible(nTbxID, bShow);
GetBindings().Invalidate( nSID );
@@ -3708,6 +3724,8 @@ void SfxViewFrame::ToolboxExec_Impl( SfxRequest &rReq )
}
}
+ if ( !pShowItem )
+ rReq.AppendItem( SfxBoolItem( nSID, bShow ) );
rReq.Done();
}
@@ -3719,11 +3737,7 @@ void SfxViewFrame::ToolboxState_Impl( SfxItemSet &rSet )
SfxWhichIter aIter(rSet);
for ( sal_uInt16 nSID = aIter.FirstWhich(); nSID; nSID = aIter.NextWhich() )
{
-#if SUPD<635
- SfxToolBoxConfig *pTbxConfig = SfxToolBoxConfig::GetOrCreate();
-#else
SfxToolBoxConfig *pTbxConfig = GetObjectShell()->GetToolBoxConfig_Impl();
-#endif
switch ( nSID )
{
case SID_TOGGLE_MENUBAR:
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index e548880d8935..abc3dd24ba19 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: viewsh.cxx,v $
*
- * $Revision: 1.27 $
+ * $Revision: 1.28 $
*
- * last change: $Author: mba $ $Date: 2002-05-27 14:19:22 $
+ * last change: $Author: mba $ $Date: 2002-06-27 08:20:49 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -176,6 +176,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
SfxTemplateCatalog aCatalog(
SFX_APP()->GetTopWindow(), &GetViewFrame()->GetBindings());
aCatalog.Execute();
+ rReq.Ignore();
break;
}
@@ -210,7 +211,10 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq )
{
InfoBox aBox( SFX_APP()->GetTopWindow(), SfxResId( MSG_ERROR_SEND_MAIL ));
aBox.Execute();
+ rReq.Ignore();
}
+ else
+ rReq.Done();
}
break;
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index b3331088c2c9..838f82e1d2a6 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -1730,7 +1730,7 @@ SfxVoidItem ClearOutline SID_OUTLINE_DELETEALL
]
//--------------------------------------------------------------------------
-SvxClipboardFmtItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
+SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS( SfxUInt32Item SelectedFormat SID_CLIPBOARD_FORMAT_ITEMS )
[
/* flags: */
@@ -1746,7 +1746,8 @@ SvxClipboardFmtItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
RecordPerSet;
Synchron;
- Readonly = FALSE,
+ /* status: */
+ SlotType = SvxClipboardFmtItem;
/* config: */
AccelConfig = FALSE,
@@ -11150,3 +11151,85 @@ SvxCharReliefItem CharacterRelief SID_ATTR_CHAR_RELIEF
GroupId = GID_CONTROLS;
]
+//--------------------------------------------------------------------------
+SvxBrushItem CharacterBackgroundPattern SID_ATTR_BRUSH_CHAR
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SvxCharRotateItem CharacterRotation SID_ATTR_CHAR_ROTATED
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+//--------------------------------------------------------------------------
+SvxCharScaleWidthItem CharacterWidthScalingFactor SID_ATTR_CHAR_SCALEWIDTH
+
+[
+ /* flags: */
+ AutoUpdate = TRUE,
+ Cachable = Cachable,
+ FastCall = FALSE,
+ HasCoreId = FALSE,
+ HasDialog = FALSE,
+ ReadOnlyDoc = FALSE,
+ Toggle = FALSE,
+ Container = FALSE,
+ RecordAbsolute = FALSE,
+ RecordPerSet;
+ Synchron;
+
+ Readonly = FALSE,
+
+ /* config: */
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
+ StatusBarConfig = FALSE,
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
+]
+
+
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 3c2a1aa9a245..d1024a94907a 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -2,9 +2,9 @@
*
* $RCSfile: svxitems.sdi,v $
*
- * $Revision: 1.14 $
+ * $Revision: 1.15 $
*
- * last change: $Author: mba $ $Date: 2002-06-19 17:14:10 $
+ * last change: $Author: mba $ $Date: 2002-06-27 08:21:40 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -399,6 +399,7 @@ item SvxShadowLocation SvxShadowLocationItem;
//-------------------------------------------------------------------------
+item INT16 SvxCharScaleWidthItem;
item INT16 SvxParaVertAlignItem;
item INT16 SvxCharReliefItem;
item BOOL SvxBlinkItem;
@@ -716,5 +717,12 @@ struct SvxTabStop
};
item SvxTabStop SvxTabStopItem;
+struct SvxCharRotate
+{
+ INT16 Rotation MID_ROTATE;
+ BOOL FitToLine MID_FITTOLINE;
+};
+item SvxCharRotate SvxCharRotateItem;
+
item String SvxClipboardFmtItem; // dummy
item String SfxSetItem; // dummy
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 047e2a9a7a0e..a08020f08aeb 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: frmitems.cxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: mba $ $Date: 2002-06-19 17:15:55 $
+ * last change: $Author: mba $ $Date: 2002-06-27 08:22:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1427,7 +1427,19 @@ sal_Bool SvxShadowItem::PutValue( const uno::Any& rVal, BYTE nMemberId )
sal_Bool bRet = QueryValue( aAny, bConvert ? CONVERT_TWIPS : 0 ) && ( aAny >>= aShadow );
switch ( nMemberId )
{
- case MID_LOCATION: rVal >>= aShadow.Location; break;
+ case MID_LOCATION:
+ {
+ bRet = (rVal >>= aShadow.Location);
+ if ( !bRet )
+ {
+ sal_Int16 nVal;
+ bRet = (rVal >>= nVal);
+ aShadow.Location = (table::ShadowLocation) nVal;
+ }
+
+ break;
+ }
+
case MID_WIDTH: rVal >>= aShadow.ShadowWidth; break;
case MID_TRANSPARENT: rVal >>= aShadow.IsTransparent; break;
case MID_BG_COLOR: rVal >>= aShadow.Color; break;
generated by cgit (git 2.34.1) at 2025-01-18 07:58:20 +0000