From a2d9f29364b4fac5215f9f1fc1debd07921b3d86 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 10 Dec 2009 18:36:58 +0100 Subject: #i107450#: move GetLanguageString to class SvtLanguageTable --- sd/source/ui/func/futext.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 0f94366f1c56..864fe286a517 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -58,7 +58,7 @@ #include #include #include - +#include // #104122# #include @@ -1385,7 +1385,7 @@ void FuText::ReceiveRequest(SfxRequest& rReq) IMPL_LINK( FuText, SpellError, void *, nLang ) { - String aError( ::GetLanguageString( (LanguageType)(ULONG)nLang ) ); + String aError( SvtLanguageTable::GetLanguageString( (LanguageType)(ULONG)nLang ) ); ErrorHandler::HandleError(* new StringErrorInfo( ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aError) ); return 0; -- cgit From ad59eb6e7139a282e1ca880e5e254c5cbd496e17 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 10 Dec 2009 23:06:35 +0100 Subject: #i107450#: move SvxSearchIten to svl --- sd/source/ui/func/fusearch.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 0164d0f1fb24..93afa31c119f 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include "fupoor.hxx" -- cgit From 7f6da30d47203158923f10d5fbd85ba48b01842c Mon Sep 17 00:00:00 2001 From: "Frank Schoenheit [fs]" Date: Tue, 15 Dec 2009 23:07:57 +0100 Subject: autorecovery: SfxViewFrame's SfxFrame is a reference now, no pointer (it can never be NULL) --- sd/source/ui/func/fubullet.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 64fb3783d78d..425d263e55ab 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -216,7 +216,7 @@ void FuBullet::InsertSpecialCharacter( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractDialog* pDlg = pFact ? pFact->CreateSfxDialog( &mpView->GetViewShell()->GetViewFrame()->GetWindow(), aSet, - mpView->GetViewShell()->GetViewFrame()->GetFrame()->GetFrameInterface(), + mpView->GetViewShell()->GetViewFrame()->GetFrame().GetFrameInterface(), RID_SVXDLG_CHARMAP ) : 0; if( !pDlg ) return; -- cgit From 7244b6bb5d8b6d109061ac693bb979821ce49b00 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Jan 2010 18:32:51 +0100 Subject: #i107450#: build all other modules with new editeng lib --- sd/source/ui/func/bulmaper.cxx | 24 ++++++++++++------------ sd/source/ui/func/fubullet.cxx | 4 ++-- sd/source/ui/func/fuchar.cxx | 4 ++-- sd/source/ui/func/fuconcs.cxx | 4 ++-- sd/source/ui/func/fuconrec.cxx | 4 ++-- sd/source/ui/func/fudraw.cxx | 4 ++-- sd/source/ui/func/fuexpand.cxx | 4 ++-- sd/source/ui/func/fuformatpaintbrush.cxx | 6 +++--- sd/source/ui/func/fuhhconv.cxx | 6 +++--- sd/source/ui/func/fuinsert.cxx | 5 ++--- sd/source/ui/func/fuinsfil.cxx | 6 +++--- sd/source/ui/func/fumorph.cxx | 2 +- sd/source/ui/func/fuoaprms.cxx | 2 +- sd/source/ui/func/fuolbull.cxx | 6 +++--- sd/source/ui/func/fuoltext.cxx | 6 +++--- sd/source/ui/func/fuoutl.cxx | 2 +- sd/source/ui/func/fupage.cxx | 20 ++++++++++---------- sd/source/ui/func/fuparagr.cxx | 6 +++--- sd/source/ui/func/fupoor.cxx | 2 +- sd/source/ui/func/fuprlout.cxx | 2 +- sd/source/ui/func/fuprobjs.cxx | 2 +- sd/source/ui/func/fusel.cxx | 4 ++-- sd/source/ui/func/fuspell.cxx | 2 +- sd/source/ui/func/fusumry.cxx | 4 ++-- sd/source/ui/func/futempl.cxx | 12 ++++++------ sd/source/ui/func/futext.cxx | 17 ++++++++--------- sd/source/ui/func/futhes.cxx | 6 +++--- sd/source/ui/func/outlinfo.cxx | 6 +++--- 28 files changed, 85 insertions(+), 87 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 95687ab8a833..f7fc58f70058 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -41,23 +41,23 @@ //-> Fonts & Items #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include //<- Fonts & Items -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include "bulmaper.hxx" diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index fac03893a880..ac0ba744e964 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -37,9 +37,9 @@ #ifndef _BINDING_HXX //autogen #include #endif -#include +#include #include -#include +#include #include "OutlineViewShell.hxx" #include "DrawViewShell.hxx" #include "Window.hxx" diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 903cc53e51db..b37761e859db 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -36,9 +36,9 @@ #include -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index a9f1445097e4..434408d85c3a 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -71,7 +71,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index d9513f4b5c22..28684dca8cac 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include // #88751# @@ -67,7 +67,7 @@ #include "ViewShellBase.hxx" #include "ToolBarManager.hxx" // #109583# -#include +#include #include #include diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 7da8b98ea568..f96c9cfd7d67 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -32,10 +32,10 @@ #include "precompiled_sd.hxx" #include -#include +#include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index d71456a7409a..b8cf0c3dbf0b 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "app.hrc" @@ -56,7 +56,7 @@ #include "optsitem.hxx" #include "sdmod.hxx" #include -#include +#include namespace sd { diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 98dbcba52ab2..90ecad5d157a 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -40,9 +40,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define _SD_DLL // fuer SD_MOD() #include "sdmod.hxx" diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 42576f8d9d53..f1a0b31ee92d 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -39,9 +39,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include "drawdoc.hxx" diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 578830b37c25..b98acd7c24e8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -52,7 +52,6 @@ #include #include #include -#include #include #include #include @@ -70,7 +69,7 @@ #include #include #ifndef _EDITENG_HXX //autogen -#include +#include #endif #include #include @@ -187,7 +186,7 @@ void FuInsertGraphic::DoExecute( SfxRequest& ) } else { - SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GetGrfFilter()->GetLastError().nStreamError ); + SdGRFFilter::HandleGraphicFilterError( (USHORT)nError, GraphicFilter::GetGraphicFilter()->GetLastError().nStreamError ); } } } diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index a6dad3779ab7..aea5c75fb949 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -34,9 +34,9 @@ #include "fuinsfil.hxx" #include #include -#include +#include #ifndef _EDITENG_HXX -#include +#include #endif #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 83851db28cae..a0ae873ab80f 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include "View.hxx" diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 5083023efdde..0b7904444926 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -36,7 +36,7 @@ #include "sdattr.hxx" #include -#include +#include #include #include #include diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index a16e6dbb20dd..1cdd41c58ce6 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -35,12 +35,12 @@ #include "fuolbull.hxx" #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include "OutlineView.hxx" #include "OutlineViewShell.hxx" diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index ff033914db47..286d4ed6533a 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -35,9 +35,9 @@ #include "fuoltext.hxx" #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index eac60c2867cd..9a7851730693 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -34,7 +34,7 @@ #include "fuoutl.hxx" -#include +#include #include "OutlineView.hxx" #include "OutlineViewShell.hxx" #ifndef SD_WINDOW_SHELL_HXX diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 284b4da2be66..10c8d69552dd 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -55,21 +55,21 @@ #ifndef _SVX_SVDUNDO_HXX #include #endif -#include -#include +#include +#include #include #include #include -#include -#include +#include +#include #include "glob.hrc" -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index a43378457812..fe11e0a26a3e 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -33,7 +33,7 @@ #include "fuparagr.hxx" -#include +#include #ifndef _MSGBOX_HXX //autogen #include #endif @@ -41,8 +41,8 @@ #include #include #include -#include -#include +#include +#include #include #include "app.hrc" diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 936802ff34cb..ba6fd311b8bb 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -74,7 +74,7 @@ #include // #98533# -#include +#include using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 7fd48732ccc4..9f0c29dbf5f8 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -66,7 +66,7 @@ #include "sdresid.hxx" #include "drawview.hxx" #include "eetext.hxx" -#include +#include #include "sdabstdlg.hxx" namespace sd diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d4f6dc71cc88..0bd334b7687c 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -37,7 +37,7 @@ #include #endif #include -#include +#include #include diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index fe97b7410ee7..5b87e6f59782 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -53,8 +53,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx index 1b7211c9212a..81c8cbb9f1c2 100644 --- a/sd/source/ui/func/fuspell.cxx +++ b/sd/source/ui/func/fuspell.cxx @@ -34,7 +34,7 @@ #include "fuspell.hxx" -#include +#include #include #include diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 0e9e6970d76d..cbb8175f1ec0 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -33,11 +33,11 @@ #include "fusumry.hxx" -#include +#include #include #include #include -#include +#include #include "strings.hrc" diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index e53d6d9d7789..e3880f1ea846 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -38,18 +38,18 @@ #include "futempl.hxx" -#include -#include +#include +#include #include // fuer SID_OBJECT_SELECT #include #include #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 864fe286a517..c588680c1b02 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -33,38 +33,37 @@ #include "futext.hxx" -#include +#include +#include #include #include #include #include -#include +#include #include #include #include -#ifndef _SVDOGROUP_HXX //autogen #include -#endif -#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include +#include #include // #104122# -#include +#include #include -#include +#include #include "sdresid.hxx" #include "app.hrc" diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 47e5adfa3a18..0c7ceeab98d1 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -35,16 +35,16 @@ #include "futhes.hxx" #include -#include +#include #include #include #include -#include +#include #include #include #include -#include +#include #include #include "app.hrc" #include "strings.hrc" diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx index 48ad73307a55..39bf23562853 100644 --- a/sd/source/ui/func/outlinfo.cxx +++ b/sd/source/ui/func/outlinfo.cxx @@ -32,10 +32,10 @@ #include "precompiled_sd.hxx" #include -#include +#include #include #include -#include +#include #include "drawdoc.hxx" #include "outlinfo.hxx" #include @@ -52,7 +52,7 @@ #ifndef _COM_SUN_STAR_I18N_CHARACTERITERATORMODE_HDL_ #include #endif -#include +#include using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -- cgit From beef7ed3c16db7f41b5f2ff5ec1dd271e046c137 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 13 Jan 2010 22:25:07 +0100 Subject: #i107450#: move more code out of svx --- sd/source/ui/func/fuinsert.cxx | 4 ++-- sd/source/ui/func/fulink.cxx | 4 ++-- sd/source/ui/func/fupage.cxx | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index b98acd7c24e8..71170ca54822 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include #include #ifndef _UNOTOOLS_UCBSTREAMHELPER_HXX @@ -77,7 +77,7 @@ #ifndef _MSGBOX_HXX //autogen #include #endif -#include +#include #include diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index 4c0bbeca5a34..78736be1de24 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -34,7 +34,7 @@ #include "fulink.hxx" -#include +#include #include #include @@ -79,7 +79,7 @@ FunctionReference FuLink::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd:: void FuLink::DoExecute( SfxRequest& ) { - SvxLinkManager* pLinkManager = mpDoc->GetLinkManager(); + sfx2::LinkManager* pLinkManager = mpDoc->GetLinkManager(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractLinksDialog* pDlg = pFact->CreateLinksDialog( mpViewShell->GetActiveWindow(), pLinkManager ); diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 10c8d69552dd..51cd3cd39bb1 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -71,7 +71,7 @@ #include #include #include -#include +#include #include "strings.hrc" #include "sdpage.hxx" -- cgit From 86cabb65ec6a4ff1252376219c734541e7eca1bd Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Tue, 9 Feb 2010 11:33:08 +0100 Subject: aw079 #i99386# finer granular changes for MPBGO removal --- sd/source/ui/func/fupage.cxx | 54 ++++++++++++++++++++++++++++++++++++++++++ sd/source/ui/func/undoback.cxx | 30 +++++++++++++++++++++++ 2 files changed, 84 insertions(+) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 284b4da2be66..8affe9314d3c 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -279,6 +279,31 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } else { +#ifdef NEWPBG + // Only this page, get attributes for background fill + const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet(); + + if(XFILL_NONE != ((const XFillStyleItem&)rBackgroundAttributes.Get(XATTR_FILLSTYLE)).GetValue()) + { + // page attributes are used, take them + aMergedAttr.Put(rBackgroundAttributes); + } + else + { + if(pStyleSheet + && XFILL_NONE != ((const XFillStyleItem&)pStyleSheet->GetItemSet().Get(XATTR_FILLSTYLE)).GetValue()) + { + // if the page has no fill style, use the settings from the + // background stylesheet (if used) + mergeItemSetsImpl(aMergedAttr, pStyleSheet->GetItemSet()); + } + else + { + // no fill style from page, start with no fill style + aMergedAttr.Put(XFillStyleItem(XFILL_NONE)); + } + } +#else // Only this page, check if there is a background-object on that page SdrObject* pObj = mpPage->GetBackgroundObj(); if( pObj ) @@ -294,6 +319,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) else aMergedAttr.Put( XFillStyleItem( XFILL_NONE ) ); } +#endif } } @@ -374,12 +400,23 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( mbPageBckgrdDeleted ) { +#ifdef NEWPBG + mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( + *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); + + if(!mpPage->IsMasterPage()) + { + // on normal pages, switch off fill attribute usage + mpPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); + } +#else mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->GetBackgroundObj() ); mpPage->SetBackgroundObj( NULL ); // #110094#-15 // tell the page that it's visualization has changed mpPage->ActionChanged(); +#endif } } @@ -406,6 +443,14 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetChanged(TRUE); +#ifdef NEWPBG + // BackgroundFill of Masterpage: no hard attributes allowed + SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); + OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)"); + rUsedMasterPage.getSdrPageProperties().ClearItem(); + OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), + "MasterPage without StyleSheet detected (!)"); +#else SdrObject* pObj = mpPage->IsMasterPage() ? mpPage->GetPresObj( PRESOBJ_BACKGROUND ) : ((SdPage&)(mpPage->TRG_GetMasterPage())).GetPresObj( PRESOBJ_BACKGROUND ); @@ -415,6 +460,7 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) SfxItemSet aSet( mpDoc->GetPool() ); pObj->SetMergedItemSet(aSet); } +#endif } aNewAttr.Put(*(pTempSet.get())); @@ -539,6 +585,13 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !mbMasterPage && !mbPageBckgrdDeleted ) { // Only this page +#ifdef NEWPBG + delete mpBackgroundObjUndoAction; + mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( + *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); + mpPage->getSdrPageProperties().ClearItem(); + mpPage->getSdrPageProperties().PutItemSet(*pArgs); +#else SdrObject* pObj = mpPage->GetBackgroundObj(); delete mpBackgroundObjUndoAction; @@ -561,6 +614,7 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) // #110094#-15 // tell the page that it's visualization has changed mpPage->ActionChanged(); +#endif } } diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index b80e834e1d18..47cd4c8262b2 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -36,6 +36,10 @@ #include "sdresid.hxx" #include "strings.hrc" +#ifdef NEWPBG +#include +#endif + // --------------------------- // - BackgroundObjUndoAction - // --------------------------- @@ -44,10 +48,20 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- +#ifdef NEWPBG +SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( + SdDrawDocument& rDoc, + SdPage& rPage, + const SfxItemSet& rItenSet) +: SdUndoAction(&rDoc), + mrPage(rPage), + mpItemSet(new SfxItemSet(rItenSet)) +#else SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ) : SdUndoAction( &rDoc ), mrPage( rPage ), mpBackgroundObj( pBackgroundObj ? pBackgroundObj->Clone() : NULL ) +#endif { String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) ); SetComment( aString ); @@ -57,13 +71,24 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPa SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction() { +#ifdef NEWPBG + delete mpItemSet; +#else SdrObject::Free( mpBackgroundObj ); +#endif } // ----------------------------------------------------------------------------- void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() { +#ifdef NEWPBG + SfxItemSet* pNew = new SfxItemSet(mrPage.getSdrPageProperties().GetItemSet()); + mrPage.getSdrPageProperties().ClearItem(); + mrPage.getSdrPageProperties().PutItemSet(*mpItemSet); + delete mpItemSet; + mpItemSet = pNew; +#else SdrObject* pOldObj = mrPage.GetBackgroundObj(); if( pOldObj ) @@ -71,6 +96,7 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() mrPage.SetBackgroundObj( mpBackgroundObj ); mpBackgroundObj = pOldObj; +#endif // #110094#-15 // tell the page that it's visualization has changed @@ -95,5 +121,9 @@ void SdBackgroundObjUndoAction::Redo() SdUndoAction* SdBackgroundObjUndoAction::Clone() const { +#ifdef NEWPBG + return new SdBackgroundObjUndoAction(*mpDoc, mrPage, *mpItemSet); +#else return new SdBackgroundObjUndoAction( *mpDoc, mrPage, mpBackgroundObj ); +#endif } -- cgit From c44386b26b233abc19936a99efb3ac7781bdaefc Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Thu, 11 Feb 2010 17:35:16 +0100 Subject: aw079 #i99386# cleanup of define and last change from CL --- sd/source/ui/func/fupage.cxx | 64 ------------------------------------------ sd/source/ui/func/undoback.cxx | 28 ------------------ 2 files changed, 92 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 8affe9314d3c..420f6d762065 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -279,7 +279,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) } else { -#ifdef NEWPBG // Only this page, get attributes for background fill const SfxItemSet& rBackgroundAttributes = mpPage->getSdrPageProperties().GetItemSet(); @@ -303,23 +302,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) aMergedAttr.Put(XFillStyleItem(XFILL_NONE)); } } -#else - // Only this page, check if there is a background-object on that page - SdrObject* pObj = mpPage->GetBackgroundObj(); - if( pObj ) - { - aMergedAttr.Put(pObj->GetMergedItemSet()); - } - else - { - // if the page hasn't got a background-object, than use - // the fillstyle-settings of the masterpage for the dialog - if( pStyleSheet && pStyleSheet->GetItemSet().GetItemState( XATTR_FILLSTYLE ) != SFX_ITEM_DEFAULT ) - mergeItemSetsImpl( aMergedAttr, pStyleSheet->GetItemSet() ); - else - aMergedAttr.Put( XFillStyleItem( XFILL_NONE ) ); - } -#endif } } @@ -400,7 +382,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) if( mbPageBckgrdDeleted ) { -#ifdef NEWPBG mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); @@ -409,14 +390,6 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) // on normal pages, switch off fill attribute usage mpPage->getSdrPageProperties().PutItem(XFillStyleItem(XFILL_NONE)); } -#else - mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->GetBackgroundObj() ); - mpPage->SetBackgroundObj( NULL ); - - // #110094#-15 - // tell the page that it's visualization has changed - mpPage->ActionChanged(); -#endif } } @@ -443,24 +416,12 @@ const SfxItemSet* FuPage::ExecuteDialog( Window* pParent ) mpDoc->SetChanged(TRUE); -#ifdef NEWPBG // BackgroundFill of Masterpage: no hard attributes allowed SdrPage& rUsedMasterPage = mpPage->IsMasterPage() ? *mpPage : mpPage->TRG_GetMasterPage(); OSL_ENSURE(rUsedMasterPage.IsMasterPage(), "No MasterPage (!)"); rUsedMasterPage.getSdrPageProperties().ClearItem(); OSL_ENSURE(0 != rUsedMasterPage.getSdrPageProperties().GetStyleSheet(), "MasterPage without StyleSheet detected (!)"); -#else - SdrObject* pObj = mpPage->IsMasterPage() ? - mpPage->GetPresObj( PRESOBJ_BACKGROUND ) : - ((SdPage&)(mpPage->TRG_GetMasterPage())).GetPresObj( PRESOBJ_BACKGROUND ); - if( pObj ) - { - // BackgroundObj: no hard attributes allowed - SfxItemSet aSet( mpDoc->GetPool() ); - pObj->SetMergedItemSet(aSet); - } -#endif } aNewAttr.Put(*(pTempSet.get())); @@ -585,36 +546,11 @@ void FuPage::ApplyItemSet( const SfxItemSet* pArgs ) if( !mbMasterPage && !mbPageBckgrdDeleted ) { // Only this page -#ifdef NEWPBG delete mpBackgroundObjUndoAction; mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, mpPage->getSdrPageProperties().GetItemSet()); mpPage->getSdrPageProperties().ClearItem(); mpPage->getSdrPageProperties().PutItemSet(*pArgs); -#else - SdrObject* pObj = mpPage->GetBackgroundObj(); - - delete mpBackgroundObjUndoAction; - mpBackgroundObjUndoAction = new SdBackgroundObjUndoAction( *mpDoc, *mpPage, pObj ); - - if( !pObj ) - { - pObj = new SdrRectObj(); - mpPage->SetBackgroundObj( pObj ); - } - - Point aPos ( nLeft, nUpper ); - Size aSize( mpPage->GetSize() ); - aSize.Width() -= nLeft + nRight - 1; - aSize.Height() -= nUpper + nLower - 1; - Rectangle aRect( aPos, aSize ); - pObj->SetLogicRect( aRect ); - pObj->SetMergedItemSet(*pArgs); - - // #110094#-15 - // tell the page that it's visualization has changed - mpPage->ActionChanged(); -#endif } } diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index 47cd4c8262b2..9df74fb26e97 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -35,10 +35,7 @@ #include "sdpage.hxx" #include "sdresid.hxx" #include "strings.hrc" - -#ifdef NEWPBG #include -#endif // --------------------------- // - BackgroundObjUndoAction - @@ -48,7 +45,6 @@ TYPEINIT1( SdBackgroundObjUndoAction, SdUndoAction ); // ----------------------------------------------------------------------------- -#ifdef NEWPBG SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, @@ -56,12 +52,6 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( : SdUndoAction(&rDoc), mrPage(rPage), mpItemSet(new SfxItemSet(rItenSet)) -#else -SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPage& rPage, const SdrObject* pBackgroundObj ) : - SdUndoAction( &rDoc ), - mrPage( rPage ), - mpBackgroundObj( pBackgroundObj ? pBackgroundObj->Clone() : NULL ) -#endif { String aString( SdResId( STR_UNDO_CHANGE_PAGEFORMAT ) ); SetComment( aString ); @@ -71,32 +61,18 @@ SdBackgroundObjUndoAction::SdBackgroundObjUndoAction( SdDrawDocument& rDoc, SdPa SdBackgroundObjUndoAction::~SdBackgroundObjUndoAction() { -#ifdef NEWPBG delete mpItemSet; -#else - SdrObject::Free( mpBackgroundObj ); -#endif } // ----------------------------------------------------------------------------- void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj() { -#ifdef NEWPBG SfxItemSet* pNew = new SfxItemSet(mrPage.getSdrPageProperties().GetItemSet()); mrPage.getSdrPageProperties().ClearItem(); mrPage.getSdrPageProperties().PutItemSet(*mpItemSet); delete mpItemSet; mpItemSet = pNew; -#else - SdrObject* pOldObj = mrPage.GetBackgroundObj(); - - if( pOldObj ) - pOldObj = pOldObj->Clone(); - - mrPage.SetBackgroundObj( mpBackgroundObj ); - mpBackgroundObj = pOldObj; -#endif // #110094#-15 // tell the page that it's visualization has changed @@ -121,9 +97,5 @@ void SdBackgroundObjUndoAction::Redo() SdUndoAction* SdBackgroundObjUndoAction::Clone() const { -#ifdef NEWPBG return new SdBackgroundObjUndoAction(*mpDoc, mrPage, *mpItemSet); -#else - return new SdBackgroundObjUndoAction( *mpDoc, mrPage, mpBackgroundObj ); -#endif } -- cgit From 9e19ff00c708a9dbcc49f924e795d8a7b418a95d Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Fri, 12 Feb 2010 15:01:35 +0100 Subject: changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision) --- sd/source/ui/func/bulmaper.cxx | 5 +---- sd/source/ui/func/fuarea.cxx | 5 +---- sd/source/ui/func/fubullet.cxx | 5 +---- sd/source/ui/func/fuchar.cxx | 5 +---- sd/source/ui/func/fucon3d.cxx | 5 +---- sd/source/ui/func/fuconarc.cxx | 5 +---- sd/source/ui/func/fuconbez.cxx | 5 +---- sd/source/ui/func/fuconcs.cxx | 5 +---- sd/source/ui/func/fuconnct.cxx | 5 +---- sd/source/ui/func/fuconrec.cxx | 5 +---- sd/source/ui/func/fuconstr.cxx | 5 +---- sd/source/ui/func/fuconuno.cxx | 5 +---- sd/source/ui/func/fucopy.cxx | 5 +---- sd/source/ui/func/fucushow.cxx | 5 +---- sd/source/ui/func/fudraw.cxx | 5 +---- sd/source/ui/func/fudspord.cxx | 5 +---- sd/source/ui/func/fuediglu.cxx | 5 +---- sd/source/ui/func/fuexpand.cxx | 5 +---- sd/source/ui/func/fuformatpaintbrush.cxx | 5 +---- sd/source/ui/func/fuhhconv.cxx | 5 +---- sd/source/ui/func/fuinsert.cxx | 5 +---- sd/source/ui/func/fuinsfil.cxx | 5 +---- sd/source/ui/func/fuline.cxx | 5 +---- sd/source/ui/func/fulinend.cxx | 5 +---- sd/source/ui/func/fulink.cxx | 5 +---- sd/source/ui/func/fumeasur.cxx | 5 +---- sd/source/ui/func/fumorph.cxx | 5 +---- sd/source/ui/func/fuoaprms.cxx | 5 +---- sd/source/ui/func/fuolbull.cxx | 5 +---- sd/source/ui/func/fuoltext.cxx | 5 +---- sd/source/ui/func/fuoutl.cxx | 5 +---- sd/source/ui/func/fupage.cxx | 5 +---- sd/source/ui/func/fuparagr.cxx | 5 +---- sd/source/ui/func/fupoor.cxx | 5 +---- sd/source/ui/func/fuprlout.cxx | 5 +---- sd/source/ui/func/fuprobjs.cxx | 5 +---- sd/source/ui/func/fuscale.cxx | 5 +---- sd/source/ui/func/fusearch.cxx | 5 +---- sd/source/ui/func/fusel.cxx | 5 +---- sd/source/ui/func/fusldlg.cxx | 5 +---- sd/source/ui/func/fusnapln.cxx | 5 +---- sd/source/ui/func/fuspell.cxx | 5 +---- sd/source/ui/func/fusumry.cxx | 5 +---- sd/source/ui/func/futempl.cxx | 5 +---- sd/source/ui/func/futext.cxx | 5 +---- sd/source/ui/func/futext2.cxx | 5 +---- sd/source/ui/func/futhes.cxx | 5 +---- sd/source/ui/func/futransf.cxx | 5 +---- sd/source/ui/func/futxtatt.cxx | 5 +---- sd/source/ui/func/fuvect.cxx | 5 +---- sd/source/ui/func/fuzoom.cxx | 5 +---- sd/source/ui/func/makefile.mk | 6 +----- sd/source/ui/func/outlinfo.cxx | 5 +---- sd/source/ui/func/sdundo.cxx | 5 +---- sd/source/ui/func/sdundogr.cxx | 5 +---- sd/source/ui/func/smarttag.cxx | 5 +---- sd/source/ui/func/undoback.cxx | 5 +---- sd/source/ui/func/undoheaderfooter.cxx | 5 +---- sd/source/ui/func/undolayer.cxx | 5 +---- sd/source/ui/func/undopage.cxx | 5 +---- sd/source/ui/func/unmovss.cxx | 5 +---- sd/source/ui/func/unoaprms.cxx | 5 +---- sd/source/ui/func/unprlout.cxx | 5 +---- 63 files changed, 63 insertions(+), 253 deletions(-) (limited to 'sd/source/ui/func') diff --git a/sd/source/ui/func/bulmaper.cxx b/sd/source/ui/func/bulmaper.cxx index 95687ab8a833..8c979bfc94b8 100644 --- a/sd/source/ui/func/bulmaper.cxx +++ b/sd/source/ui/func/bulmaper.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: bulmaper.cxx,v $ - * $Revision: 1.10.80.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx index e070365eddda..31c4c1358d3a 100644 --- a/sd/source/ui/func/fuarea.cxx +++ b/sd/source/ui/func/fuarea.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuarea.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fubullet.cxx b/sd/source/ui/func/fubullet.cxx index 63dc54edefa5..7abae3a62006 100644 --- a/sd/source/ui/func/fubullet.cxx +++ b/sd/source/ui/func/fubullet.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fubullet.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuchar.cxx b/sd/source/ui/func/fuchar.cxx index 903cc53e51db..29ac48d66abf 100644 --- a/sd/source/ui/func/fuchar.cxx +++ b/sd/source/ui/func/fuchar.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuchar.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index eb738ef0d2fa..ef0827cc6efc 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fucon3d.cxx,v $ - * $Revision: 1.23.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index de658c401428..7a7ab2b9dc2e 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconarc.cxx,v $ - * $Revision: 1.17 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx index 1e16ac4c332c..e95a2377e4ee 100644 --- a/sd/source/ui/func/fuconbez.cxx +++ b/sd/source/ui/func/fuconbez.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconbez.cxx,v $ - * $Revision: 1.20 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx index a9f1445097e4..0a4466569b70 100644 --- a/sd/source/ui/func/fuconcs.cxx +++ b/sd/source/ui/func/fuconcs.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconcs.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconnct.cxx b/sd/source/ui/func/fuconnct.cxx index 7542aff67e7a..edce9a5e38e4 100644 --- a/sd/source/ui/func/fuconnct.cxx +++ b/sd/source/ui/func/fuconnct.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconnct.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index d9513f4b5c22..2354e7dbe80f 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconrec.cxx,v $ - * $Revision: 1.33 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 28531c7bef47..26119b6a03b9 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconstr.cxx,v $ - * $Revision: 1.19 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx index 512ccdb53623..fffcaf3c0b9f 100644 --- a/sd/source/ui/func/fuconuno.cxx +++ b/sd/source/ui/func/fuconuno.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuconuno.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fucopy.cxx b/sd/source/ui/func/fucopy.cxx index d8ad1f54bc45..0335ff9aa13c 100644 --- a/sd/source/ui/func/fucopy.cxx +++ b/sd/source/ui/func/fucopy.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fucopy.cxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fucushow.cxx b/sd/source/ui/func/fucushow.cxx index 5067d15c5827..1ca6da60a713 100644 --- a/sd/source/ui/func/fucushow.cxx +++ b/sd/source/ui/func/fucushow.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fucushow.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fudraw.cxx b/sd/source/ui/func/fudraw.cxx index 7da8b98ea568..7d7edb2d61f9 100644 --- a/sd/source/ui/func/fudraw.cxx +++ b/sd/source/ui/func/fudraw.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fudraw.cxx,v $ - * $Revision: 1.35 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx index c0103d58c475..2e6ad66e11f1 100644 --- a/sd/source/ui/func/fudspord.cxx +++ b/sd/source/ui/func/fudspord.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fudspord.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuediglu.cxx b/sd/source/ui/func/fuediglu.cxx index 24ed231ea25b..ddae68d8b9ab 100644 --- a/sd/source/ui/func/fuediglu.cxx +++ b/sd/source/ui/func/fuediglu.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuediglu.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index d71456a7409a..4785ce71e174 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuexpand.cxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index 98dbcba52ab2..81c3b16dccae 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuformatpaintbrush.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuhhconv.cxx b/sd/source/ui/func/fuhhconv.cxx index 42576f8d9d53..77ed7215e4df 100644 --- a/sd/source/ui/func/fuhhconv.cxx +++ b/sd/source/ui/func/fuhhconv.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuhhconv.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 578830b37c25..e0695ae98ae8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuinsert.cxx,v $ - * $Revision: 1.48 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuinsfil.cxx b/sd/source/ui/func/fuinsfil.cxx index a6dad3779ab7..9b4ff8cf95ae 100644 --- a/sd/source/ui/func/fuinsfil.cxx +++ b/sd/source/ui/func/fuinsfil.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuinsfil.cxx,v $ - * $Revision: 1.43 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuline.cxx b/sd/source/ui/func/fuline.cxx index 08fdf2eb24b7..b14d5f6acc08 100644 --- a/sd/source/ui/func/fuline.cxx +++ b/sd/source/ui/func/fuline.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuline.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index 1eb3300d30df..9c53518507f3 100644 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fulinend.cxx,v $ - * $Revision: 1.15 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fulink.cxx b/sd/source/ui/func/fulink.cxx index 4c0bbeca5a34..fd8e0f950eff 100644 --- a/sd/source/ui/func/fulink.cxx +++ b/sd/source/ui/func/fulink.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fulink.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fumeasur.cxx b/sd/source/ui/func/fumeasur.cxx index 948117b22425..55344a46acc2 100644 --- a/sd/source/ui/func/fumeasur.cxx +++ b/sd/source/ui/func/fumeasur.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fumeasur.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index db1dc120e478..0ea3e1210653 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fumorph.cxx,v $ - * $Revision: 1.19.114.2 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 5083023efdde..13c1a8b8f15d 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuoaprms.cxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx index a16e6dbb20dd..2d5c73dec78e 100644 --- a/sd/source/ui/func/fuolbull.cxx +++ b/sd/source/ui/func/fuolbull.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuolbull.cxx,v $ - * $Revision: 1.11.104.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuoltext.cxx b/sd/source/ui/func/fuoltext.cxx index ff033914db47..d6b8b9501e18 100644 --- a/sd/source/ui/func/fuoltext.cxx +++ b/sd/source/ui/func/fuoltext.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuoltext.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuoutl.cxx b/sd/source/ui/func/fuoutl.cxx index eac60c2867cd..922563acefc5 100644 --- a/sd/source/ui/func/fuoutl.cxx +++ b/sd/source/ui/func/fuoutl.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuoutl.cxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index 284b4da2be66..be1d1db8caa4 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fupage.cxx,v $ - * $Revision: 1.31 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx index a43378457812..92edfddf7033 100644 --- a/sd/source/ui/func/fuparagr.cxx +++ b/sd/source/ui/func/fuparagr.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuparagr.cxx,v $ - * $Revision: 1.17 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index 936802ff34cb..07d7aeff7eca 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fupoor.cxx,v $ - * $Revision: 1.50.74.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuprlout.cxx b/sd/source/ui/func/fuprlout.cxx index 7fd48732ccc4..250212d31c11 100644 --- a/sd/source/ui/func/fuprlout.cxx +++ b/sd/source/ui/func/fuprlout.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuprlout.cxx,v $ - * $Revision: 1.17.130.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuprobjs.cxx b/sd/source/ui/func/fuprobjs.cxx index d4f6dc71cc88..629074eaa879 100644 --- a/sd/source/ui/func/fuprobjs.cxx +++ b/sd/source/ui/func/fuprobjs.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuprobjs.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuscale.cxx b/sd/source/ui/func/fuscale.cxx index b61836a74cca..dc5677c6ef2d 100644 --- a/sd/source/ui/func/fuscale.cxx +++ b/sd/source/ui/func/fuscale.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuscale.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fusearch.cxx b/sd/source/ui/func/fusearch.cxx index 0164d0f1fb24..61b83e56e9cb 100644 --- a/sd/source/ui/func/fusearch.cxx +++ b/sd/source/ui/func/fusearch.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fusearch.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx index fe97b7410ee7..bb4d78d20aec 100644 --- a/sd/source/ui/func/fusel.cxx +++ b/sd/source/ui/func/fusel.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fusel.cxx,v $ - * $Revision: 1.55.74.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx index b10f539cf29e..76af1555c861 100644 --- a/sd/source/ui/func/fusldlg.cxx +++ b/sd/source/ui/func/fusldlg.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fusldlg.cxx,v $ - * $Revision: 1.11 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fusnapln.cxx b/sd/source/ui/func/fusnapln.cxx index 9f0214668f82..ab686481b402 100644 --- a/sd/source/ui/func/fusnapln.cxx +++ b/sd/source/ui/func/fusnapln.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fusnapln.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuspell.cxx b/sd/source/ui/func/fuspell.cxx index 1b7211c9212a..a7149fc0d503 100644 --- a/sd/source/ui/func/fuspell.cxx +++ b/sd/source/ui/func/fuspell.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuspell.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 0e9e6970d76d..d118e85d3e04 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fusumry.cxx,v $ - * $Revision: 1.14 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx index e53d6d9d7789..bd1bf9c1d265 100644 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futempl.cxx,v $ - * $Revision: 1.28 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index 0f94366f1c56..3b96ac7f4765 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futext.cxx,v $ - * $Revision: 1.66.8.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futext2.cxx b/sd/source/ui/func/futext2.cxx index 7a34b2a933ac..5e6bed107e93 100644 --- a/sd/source/ui/func/futext2.cxx +++ b/sd/source/ui/func/futext2.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futext2.cxx,v $ - * $Revision: 1.9 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futhes.cxx b/sd/source/ui/func/futhes.cxx index 47e5adfa3a18..4e032b913f3c 100644 --- a/sd/source/ui/func/futhes.cxx +++ b/sd/source/ui/func/futhes.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futhes.cxx,v $ - * $Revision: 1.18 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futransf.cxx b/sd/source/ui/func/futransf.cxx index a5782aadb4c8..f62b1b087aee 100644 --- a/sd/source/ui/func/futransf.cxx +++ b/sd/source/ui/func/futransf.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futransf.cxx,v $ - * $Revision: 1.12.114.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/futxtatt.cxx b/sd/source/ui/func/futxtatt.cxx index 8ab4d8d02a75..f434f2790620 100644 --- a/sd/source/ui/func/futxtatt.cxx +++ b/sd/source/ui/func/futxtatt.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: futxtatt.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuvect.cxx b/sd/source/ui/func/fuvect.cxx index 108e6738a973..5a8419ba7822 100644 --- a/sd/source/ui/func/fuvect.cxx +++ b/sd/source/ui/func/fuvect.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuvect.cxx,v $ - * $Revision: 1.12 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx index dcd1f349b967..390522cc33ca 100644 --- a/sd/source/ui/func/fuzoom.cxx +++ b/sd/source/ui/func/fuzoom.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: fuzoom.cxx,v $ - * $Revision: 1.13 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/makefile.mk b/sd/source/ui/func/makefile.mk index c8779290be0a..332d5d505792 100644 --- a/sd/source/ui/func/makefile.mk +++ b/sd/source/ui/func/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.23 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/outlinfo.cxx b/sd/source/ui/func/outlinfo.cxx index 48ad73307a55..d9286cd5bf3b 100644 --- a/sd/source/ui/func/outlinfo.cxx +++ b/sd/source/ui/func/outlinfo.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: outlinfo.cxx,v $ - * $Revision: 1.16 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/sdundo.cxx b/sd/source/ui/func/sdundo.cxx index ef1d53a317b5..83619cc0efe9 100644 --- a/sd/source/ui/func/sdundo.cxx +++ b/sd/source/ui/func/sdundo.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdundo.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/sdundogr.cxx b/sd/source/ui/func/sdundogr.cxx index 088a567d3f95..daea6eef49a2 100644 --- a/sd/source/ui/func/sdundogr.cxx +++ b/sd/source/ui/func/sdundogr.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: sdundogr.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/smarttag.cxx b/sd/source/ui/func/smarttag.cxx index ecd2c7a685f6..4246b11a5af8 100644 --- a/sd/source/ui/func/smarttag.cxx +++ b/sd/source/ui/func/smarttag.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: smarttag.cxx,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx index b80e834e1d18..2f1ab259bc55 100644 --- a/sd/source/ui/func/undoback.cxx +++ b/sd/source/ui/func/undoback.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: undoback.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/undoheaderfooter.cxx b/sd/source/ui/func/undoheaderfooter.cxx index 4102a2edb601..778bd3056027 100644 --- a/sd/source/ui/func/undoheaderfooter.cxx +++ b/sd/source/ui/func/undoheaderfooter.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: undoheaderfooter.cxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/undolayer.cxx b/sd/source/ui/func/undolayer.cxx index ba3623569056..4739ae9b5c16 100644 --- a/sd/source/ui/func/undolayer.cxx +++ b/sd/source/ui/func/undolayer.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: undolayer.cxx,v $ - * $Revision: 1.7 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/undopage.cxx b/sd/source/ui/func/undopage.cxx index 2707f2348974..2da4d6260834 100644 --- a/sd/source/ui/func/undopage.cxx +++ b/sd/source/ui/func/undopage.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: undopage.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/unmovss.cxx b/sd/source/ui/func/unmovss.cxx index 962294e0a3c0..2ccaa4da19cb 100644 --- a/sd/source/ui/func/unmovss.cxx +++ b/sd/source/ui/func/unmovss.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unmovss.cxx,v $ - * $Revision: 1.8 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/unoaprms.cxx b/sd/source/ui/func/unoaprms.cxx index 7dcd41f87339..684487d0c592 100644 --- a/sd/source/ui/func/unoaprms.cxx +++ b/sd/source/ui/func/unoaprms.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unoaprms.cxx,v $ - * $Revision: 1.10 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/sd/source/ui/func/unprlout.cxx b/sd/source/ui/func/unprlout.cxx index ff4aeb285715..ec0b223cf6a8 100644 --- a/sd/source/ui/func/unprlout.cxx +++ b/sd/source/ui/func/unprlout.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: unprlout.cxx,v $ - * $Revision: 1.6 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify -- cgit