summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/drviews9.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:11:31 +0200
commit4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch)
tree2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/view/drviews9.cxx
parent2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff)
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 18 19:01:18 2011 +0100 Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4) commit 2764d5adfcd646794593cda200fca9d4988d0d06 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:59:37 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/view/drviews9.cxx')
-rw-r--r--sd/source/ui/view/drviews9.cxx50
1 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx
index bcaac6d8b866..217ef520c53b 100644
--- a/sd/source/ui/view/drviews9.cxx
+++ b/sd/source/ui/view/drviews9.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
@@ -97,8 +97,8 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
if ( pArgs )
{
- const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue();
- GalleryExplorer* pGal = SVX_GALLERY();
+ const UINT32 nFormats = ( (SfxUInt32Item&) pArgs->Get( SID_GALLERY_FORMATS ) ).GetValue();
+ GalleryExplorer* pGal = SVX_GALLERY();
if ( pGal )
{
@@ -125,12 +125,12 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
// Falls Grafik zu gross, wird die Grafik
// in die Seite eingepasst
- if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
+ if ( ( ( aSize.Height() > aPageSize.Height() ) || ( aSize.Width() > aPageSize.Width() ) ) &&
aSize.Height() && aPageSize.Height() )
{
- float fGrfWH = (float)aSize.Width() /
+ float fGrfWH = (float)aSize.Width() /
(float)aSize.Height();
- float fWinWH = (float)aPageSize.Width() /
+ float fWinWH = (float)aPageSize.Width() /
(float)aPageSize.Height();
// Grafik an Pagesize anpassen (skaliert)
@@ -148,7 +148,7 @@ void DrawViewShell::ExecGallery(SfxRequest& rReq)
// Ausgaberechteck fuer Grafik setzen
- Point aPnt ((aPageSize.Width() - aSize.Width()) / 2,
+ Point aPnt ((aPageSize.Width() - aSize.Width()) / 2,
(aPageSize.Height() - aSize.Height()) / 2);
aPnt += Point(pPage->GetLftBorder(), pPage->GetUppBorder());
Rectangle aRect (aPnt, aSize);
@@ -255,8 +255,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
CheckLineTo (rReq);
- SfxBindings& rBindings = GetViewFrame()->GetBindings();
- SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() );
+ SfxBindings& rBindings = GetViewFrame()->GetBindings();
+ SfxItemSet* pAttr = new SfxItemSet ( GetDoc()->GetPool() );
GetView()->GetAttributes( *pAttr );
const SfxItemSet* pArgs = rReq.GetArgs();
@@ -372,8 +372,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
XGradientList *pGradientList = GetDoc()->GetGradientList ();
- long nCounts = pGradientList->Count ();
- Color aColor ((BYTE) pRed->GetValue (),
+ long nCounts = pGradientList->Count ();
+ Color aColor ((BYTE) pRed->GetValue (),
(BYTE) pGreen->GetValue (),
(BYTE) pBlue->GetValue ());
long i;
@@ -432,8 +432,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
SFX_REQUEST_ARG (rReq, pBlue, SfxUInt32Item, ID_VAL_BLUE, FALSE);
XHatchList *pHatchList = GetDoc()->GetHatchList ();
- long nCounts = pHatchList->Count ();
- Color aColor ((BYTE) pRed->GetValue (),
+ long nCounts = pHatchList->Count ();
+ Color aColor ((BYTE) pRed->GetValue (),
(BYTE) pGreen->GetValue (),
(BYTE) pBlue->GetValue ());
long i;
@@ -497,8 +497,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
pAttr->ClearItem (XATTR_LINESTYLE);
XDashList *pDashList = GetDoc()->GetDashList ();
- long nCounts = pDashList->Count ();
- XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ());
+ long nCounts = pDashList->Count ();
+ XDashEntry *pEntry = new XDashEntry (aNewDash, pName->GetValue ());
long i;
for ( i = 0; i < nCounts; i++ )
@@ -549,7 +549,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
pAttr->ClearItem (XATTR_FILLSTYLE);
XGradientList *pGradientList = GetDoc()->GetGradientList ();
- long nCounts = pGradientList->Count ();
+ long nCounts = pGradientList->Count ();
long i;
for ( i = 0; i < nCounts; i++ )
@@ -615,7 +615,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
pAttr->ClearItem (XATTR_FILLSTYLE);
XHatchList *pHatchList = GetDoc()->GetHatchList ();
- long nCounts = pHatchList->Count ();
+ long nCounts = pHatchList->Count ();
long i;
for ( i = 0; i < nCounts; i++ )
@@ -665,7 +665,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
XGradientList *pGradientList = GetDoc()->GetGradientList ();
- long nCounts = pGradientList->Count ();
+ long nCounts = pGradientList->Count ();
for (long i = 0;
i < nCounts;
@@ -699,7 +699,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
SFX_REQUEST_ARG (rReq, pName, SfxStringItem, ID_VAL_INDEX, FALSE);
XHatchList *pHatchList = GetDoc()->GetHatchList ();
- long nCounts = pHatchList->Count ();
+ long nCounts = pHatchList->Count ();
for (long i = 0;
i < nCounts;
@@ -740,7 +740,7 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
StarBASIC::FatalError (SbERR_WRONG_ARGS);
break;
-/* case SID_SETFONTFAMILYNAME :
+/* case SID_SETFONTFAMILYNAME :
case SID_SETFONTSTYLENAME :
case SID_SETFONTFAMILY :
case SID_SETFONTPITCH :
@@ -776,8 +776,8 @@ void DrawViewShell::AttrExec (SfxRequest &rReq)
void DrawViewShell::AttrState (SfxItemSet& rSet)
{
- SfxWhichIter aIter (rSet);
- USHORT nWhich = aIter.FirstWhich ();
+ SfxWhichIter aIter (rSet);
+ USHORT nWhich = aIter.FirstWhich ();
SfxItemSet aAttr( GetDoc()->GetPool() );
mpDrawView->GetAttributes( aAttr );
@@ -814,7 +814,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet)
case SID_GETBLUE :
{
const SfxUInt32Item &rWhatKind = (const SfxUInt32Item &) rSet.Get (ID_VAL_WHATKIND);
- Color aColor;
+ Color aColor;
switch (rWhatKind.GetValue ())
{
@@ -838,7 +838,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet)
case 4 :
{
const XFillGradientItem &rFillGradientItem = (const XFillGradientItem &) aAttr.Get (XATTR_FILLGRADIENT);
- const XGradient &rGradient = rFillGradientItem.GetGradientValue ();
+ const XGradient &rGradient = rFillGradientItem.GetGradientValue ();
aColor = (rWhatKind.GetValue () == 3)
? rGradient.GetStartColor ()
@@ -849,7 +849,7 @@ void DrawViewShell::AttrState (SfxItemSet& rSet)
case 5:
{
const XFillHatchItem &rFillHatchItem = (const XFillHatchItem &) aAttr.Get (XATTR_FILLHATCH);
- const XHatch &rHatch = rFillHatchItem.GetHatchValue ();
+ const XHatch &rHatch = rFillHatchItem.GetHatchValue ();
aColor = rHatch.GetColor ();
break;