Skip to content

C
core
Kaydet (Commit) 1d2cb239 authored tarafından Dieter Loeschky's avatar Dieter Loeschky
Dosyalara gözat
Seçenekler

#92085# + SID_RULER_OBJECT

üst 8243e62d
Hide whitespace changes
Inline Side-by-side
Showing with 97 additions and 46 deletions
sd/sdi/_drvwsh.sdi
Dosyayı görüntüle @ 1d2cb239
......@@ -2,9 +2,9 @@
*
* $RCSfile: _drvwsh.sdi,v $
*
* $Revision: 1.8 $
* $Revision: 1.9 $
*
* last change: $Author: dl $ $Date: 2001-08-20 11:17:41 $
* last change: $Author: dl $ $Date: 2001-09-18 14:53:39 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -1389,13 +1389,13 @@ interface DrawView : View
ExecMethod = ExecRuler ;
StateMethod = GetRulerState ;
]
/*
SID_RULER_OBJECT // ole : no, status : ?
[
ExecMethod = ExecRuler ;
StateMethod = GetRulerState ;
]
*/
SID_RULER_NULL_OFFSET // ole : no, status : ?
[
ExecMethod = ExecRuler ;
......
sd/sdi/sdnew.sdi
Dosyayı görüntüle @ 1d2cb239
......@@ -22,3 +22,35 @@ SfxBoolItem VerticalTextFitToSizeTool SID_TEXT_FITTOSIZE_VERTICAL
GroupId = GID_FORMAT;
]
SvxObjectItem RulerObject SID_RULER_OBJECT
[
/* flags: */
AutoUpdate = FALSE,
Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Synchron;
/* plugin: */
Container = FALSE,
PlugComm = FALSE,
/* api: */
Export = TRUE,
IsCollection = FALSE,
Readonly = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
/* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
ToolBoxConfig = FALSE,
GroupId = ;
]
sd/source/ui/view/drviews1.cxx
Dosyayı görüntüle @ 1d2cb239
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviews1.cxx,v $
*
* $Revision: 1.11 $
* $Revision: 1.12 $
*
* last change: $Author: dl $ $Date: 2001-09-13 11:21:46 $
* last change: $Author: dl $ $Date: 2001-09-18 14:57:07 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -701,7 +701,7 @@ void SdDrawViewShell::UpdateHRuler()
{
Invalidate( SID_ATTR_LONG_LRSPACE );
Invalidate( SID_RULER_PAGE_POS );
// Invalidate( SID_RULER_OBJECT );
Invalidate( SID_RULER_OBJECT );
for (USHORT nIndex=0; nIndex<MAX_HSPLIT_CNT; nIndex++)
{
......@@ -722,7 +722,7 @@ void SdDrawViewShell::UpdateVRuler()
{
Invalidate( SID_ATTR_LONG_LRSPACE );
Invalidate( SID_RULER_PAGE_POS );
// Invalidate( SID_RULER_OBJECT );
Invalidate( SID_RULER_OBJECT );
for (USHORT nIndex=0; nIndex<MAX_VSPLIT_CNT; nIndex++)
{
......
sd/source/ui/view/drviews3.cxx
Dosyayı görüntüle @ 1d2cb239
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviews3.cxx,v $
*
* $Revision: 1.7 $
* $Revision: 1.8 $
*
* last change: $Author: dl $ $Date: 2001-09-13 11:21:07 $
* last change: $Author: dl $ $Date: 2001-09-18 14:58:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -537,39 +537,58 @@ void SdDrawViewShell::ExecRuler(SfxRequest& rReq)
{
const SvxLongLRSpaceItem& rLRSpace = (const SvxLongLRSpaceItem&)
pArgs->Get(GetPool().GetWhich(SID_ATTR_LONG_LRSPACE));
long nLeft = Max(0L, rLRSpace.GetLeft() - aPagePos.X());
long nRight = Max(0L, rLRSpace.GetRight() + aPagePos.X() +
aPageSize.Width() - aViewSize.Width());
USHORT nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (USHORT i = 0; i < nPageCnt; i++)
if( pDrView->IsTextEdit() )
{
SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
SdUndoAction* pUndo = new SdPageLRUndoAction(pDoc,
pPage,
pPage->GetLftBorder(),
pPage->GetRgtBorder(),
nLeft, nRight);
pUndoGroup->AddAction(pUndo);
pPage->SetLftBorder(nLeft);
pPage->SetRgtBorder(nRight);
Point aPagePos = pWindow->GetViewOrigin();
Rectangle aRect = aMarkRect;
aRect.SetPos(aRect.TopLeft() + aPagePos);
aRect.Left() = rLRSpace.GetLeft();
aRect.Right() = aViewSize.Width() - rLRSpace.GetRight();
aRect.SetPos(aRect.TopLeft() - aPagePos);
if ( aRect != aMarkRect)
{
pDrView->SetAllMarkedRect(aRect);
aMarkRect = pDrView->GetAllMarkedRect();
Invalidate( SID_RULER_OBJECT );
}
}
nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
else
{
SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
SdUndoAction* pUndo = new SdPageLRUndoAction(pDoc,
pPage,
pPage->GetLftBorder(),
pPage->GetRgtBorder(),
nLeft, nRight);
pUndoGroup->AddAction(pUndo);
pPage->SetLftBorder(nLeft);
pPage->SetRgtBorder(nRight);
long nLeft = Max(0L, rLRSpace.GetLeft() - aPagePos.X());
long nRight = Max(0L, rLRSpace.GetRight() + aPagePos.X() +
aPageSize.Width() - aViewSize.Width());
USHORT nPageCnt = pDoc->GetSdPageCount(ePageKind);
for (USHORT i = 0; i < nPageCnt; i++)
{
SdPage* pPage = pDoc->GetSdPage(i, ePageKind);
SdUndoAction* pUndo = new SdPageLRUndoAction(pDoc,
pPage,
pPage->GetLftBorder(),
pPage->GetRgtBorder(),
nLeft, nRight);
pUndoGroup->AddAction(pUndo);
pPage->SetLftBorder(nLeft);
pPage->SetRgtBorder(nRight);
}
nPageCnt = pDoc->GetMasterSdPageCount(ePageKind);
for (i = 0; i < nPageCnt; i++)
{
SdPage* pPage = pDoc->GetMasterSdPage(i, ePageKind);
SdUndoAction* pUndo = new SdPageLRUndoAction(pDoc,
pPage,
pPage->GetLftBorder(),
pPage->GetRgtBorder(),
nLeft, nRight);
pUndoGroup->AddAction(pUndo);
pPage->SetLftBorder(nLeft);
pPage->SetRgtBorder(nRight);
}
InvalidateWindows();
}
InvalidateWindows();
break;
}
case SID_ATTR_LONG_ULSPACE:
......@@ -611,7 +630,8 @@ void SdDrawViewShell::ExecRuler(SfxRequest& rReq)
InvalidateWindows();
break;
}
/* case SID_RULER_OBJECT:
case SID_RULER_OBJECT:
{
Point aPagePos = pWindow->GetViewOrigin();
Rectangle aRect = aMarkRect;
......@@ -639,7 +659,6 @@ void SdDrawViewShell::ExecRuler(SfxRequest& rReq)
}
break;
}
*/
case SID_ATTR_TABSTOP:
{
......@@ -770,7 +789,7 @@ void SdDrawViewShell::GetRulerState(SfxItemSet& rSet)
aULSpace.SetUpper( aPagePos.Y() + aMarkRect.Top() );
aULSpace.SetLower( aRect.Bottom() + aPageSize.Height() - aMarkRect.Bottom() );
// rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( SID_RULER_OBJECT );
// Seitenraender werden gelocked
aProtect.SetSizeProtect( TRUE );
......@@ -790,13 +809,13 @@ void SdDrawViewShell::GetRulerState(SfxItemSet& rSet)
}
else
{
// rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( ITEMID_TABSTOP );
}
}
else
{
// rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( SID_RULER_OBJECT );
rSet.DisableItem( ITEMID_TABSTOP );
}
......
sd/source/ui/view/drviews8.cxx
Dosyayı görüntüle @ 1d2cb239
......@@ -2,9 +2,9 @@
*
* $RCSfile: drviews8.cxx,v $
*
* $Revision: 1.2 $
* $Revision: 1.3 $
*
* last change: $Author: ka $ $Date: 2000-09-21 16:12:19 $
* last change: $Author: dl $ $Date: 2001-09-18 14:59:01 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
......@@ -151,7 +151,7 @@ void SdDrawViewShell::FuTemp01(SfxRequest& rReq)
case SID_ATTR_TRANSFORM:
{
pFuActual = new FuTransform( this, pWindow, pDrView, pDoc, rReq );
// Invalidate(SID_RULER_OBJECT);
Invalidate(SID_RULER_OBJECT);
Cancel();
}
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment