diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx index 6a46f57..bc67903 100644 --- a/editeng/source/items/flditem.cxx +++ b/editeng/source/items/flditem.cxx @@ -119,8 +119,6 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference& xTe } case text::textfield::Type::PAGE: return new SvxPageField(); - case text::textfield::Type::PAGE_TITLE: - return new SvxPageTitleField(); case text::textfield::Type::PAGES: return new SvxPagesField(); case text::textfield::Type::DOCINFO_TITLE: @@ -640,40 +638,6 @@ MetaAction* SvxPageField::createBeginComment() const return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageField" ); } -// -// SvxPageTitleField methods -// - -SV_IMPL_PERSIST1( SvxPageTitleField, SvxFieldData ); - -SvxPageTitleField::SvxPageTitleField() {} - -SvxFieldData* SvxPageTitleField::Clone() const -{ - return new SvxPageTitleField(); -} - -int SvxPageTitleField::operator==( const SvxFieldData& rCmp ) const -{ - return ( rCmp.Type() == TYPE(SvxPageTitleField) ); -} - -void SvxPageTitleField::Load( SvPersistStream & /*rStm*/ ) -{ -} - -void SvxPageTitleField::Save( SvPersistStream & /*rStm*/ ) -{ -} - -MetaAction* SvxPageTitleField::createBeginComment() const -{ - return new MetaCommentAction( "FIELD_SEQ_BEGIN;PageTitleField" ); -} - -// -// SvxPagesField -// SV_IMPL_PERSIST1( SvxPagesField, SvxFieldData ); @@ -1193,15 +1157,14 @@ SvClassManager& SvxFieldItem::GetClassManager() if ( !pClassMgr ) { pClassMgr = new SvClassManager; - pClassMgr->Register(SvxFieldData::StaticClassId(), SvxFieldData::CreateInstance); - pClassMgr->Register(SvxURLField::StaticClassId(), SvxURLField::CreateInstance); - pClassMgr->Register(SvxDateField::StaticClassId(), SvxDateField::CreateInstance); - pClassMgr->Register(SvxPageField::StaticClassId(), SvxPageField::CreateInstance); - pClassMgr->Register(SvxPageTitleField::StaticClassId(), SvxPageTitleField::CreateInstance); - pClassMgr->Register(SvxTimeField::StaticClassId(), SvxTimeField::CreateInstance); - pClassMgr->Register(SvxExtTimeField::StaticClassId(), SvxExtTimeField::CreateInstance); - pClassMgr->Register(SvxExtFileField::StaticClassId(), SvxExtFileField::CreateInstance); - pClassMgr->Register(SvxAuthorField::StaticClassId(), SvxAuthorField::CreateInstance); + pClassMgr->Register(SvxFieldData::StaticClassId(), SvxFieldData::CreateInstance); + pClassMgr->Register(SvxURLField::StaticClassId(), SvxURLField::CreateInstance); + pClassMgr->Register(SvxDateField::StaticClassId(), SvxDateField::CreateInstance); + pClassMgr->Register(SvxPageField::StaticClassId(), SvxPageField::CreateInstance); + pClassMgr->Register(SvxTimeField::StaticClassId(), SvxTimeField::CreateInstance); + pClassMgr->Register(SvxExtTimeField::StaticClassId(), SvxExtTimeField::CreateInstance); + pClassMgr->Register(SvxExtFileField::StaticClassId(), SvxExtFileField::CreateInstance); + pClassMgr->Register(SvxAuthorField::StaticClassId(), SvxAuthorField::CreateInstance); } return *pClassMgr; diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx index b7e8e95..37f42a3 100644 --- a/include/editeng/flditem.hxx +++ b/include/editeng/flditem.hxx @@ -24,7 +24,6 @@ #include #include #include -#include <../sd/inc/sdpage.hxx> // for Page Title field #include "editeng/editengdllapi.h" #include @@ -192,22 +191,6 @@ public: virtual MetaAction* createBeginComment() const; }; -// -// Field data for the title of the current Page (in Draw) or Slide (in Impress) -// - -class EDITENG_DLLPUBLIC SvxPageTitleField : public SvxFieldData -{ -public: - SV_DECL_PERSIST1( SvxPageTitleField, SvxFieldData, com::sun::star::text::textfield::Type::PAGE_TITLE ) - SvxPageTitleField(); - - virtual SvxFieldData* Clone() const; - virtual int operator==( const SvxFieldData& ) const; - - virtual MetaAction* createBeginComment() const; -}; - class EDITENG_DLLPUBLIC SvxPagesField : public SvxFieldData { public: diff --git a/offapi/com/sun/star/text/textfield/PageTitle.idl b/offapi/com/sun/star/text/textfield/PageTitle.idl deleted file mode 100644 index 7a77eb3..0000000 --- a/offapi/com/sun/star/text/textfield/PageTitle.idl +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef __com_sun_star_text_textfield_PageNumber_idl__ -#define __com_sun_star_text_textfield_PageNumber_idl__ - -#include -#include - - -module com { module sun { module star { module text { module textfield { - -/** specifies service of a page number text field. - @see com::sun::star::text::TextField -*/ -published service PageNumber -{ - service com::sun::star::text::TextField; - - /** determines which page the field refers to. - @see PageNumberType - */ - [property] PageNumberType SubType; -}; - - -}; }; }; }; }; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/offapi/com/sun/star/text/textfield/Type.idl b/offapi/com/sun/star/text/textfield/Type.idl index 3a3f784..91102af 100644 --- a/offapi/com/sun/star/text/textfield/Type.idl +++ b/offapi/com/sun/star/text/textfield/Type.idl @@ -42,8 +42,6 @@ constants Type const long PRESENTATION_HEADER = 11; const long PRESENTATION_FOOTER = 12; const long PRESENTATION_DATE_TIME = 13; - - const long PAGE_TITLE = 14; }; }; }; }; }; }; diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu index bf253d7..a1fef54 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu @@ -485,11 +485,6 @@ ~Page Number - - - Page Tit~le - - Page ~Count diff --git a/scripting/workben/bindings/impressmenubar.xml b/scripting/workben/bindings/impressmenubar.xml index 8c117f62..a76991d 100644 --- a/scripting/workben/bindings/impressmenubar.xml +++ b/scripting/workben/bindings/impressmenubar.xml @@ -187,7 +187,6 @@ - diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 84791ad..d421a9b 100644 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -374,7 +374,6 @@ #define SID_TITLE_MASTERPAGE (SID_SD_START+351) #define SID_INSERTPAGE_QUICK (SID_SD_START+352) // free -#define SID_INSERT_FLD_PAGE_TITLE (SID_SD_START+356) #define SID_INSERT_FLD_DATE_VAR (SID_SD_START+357) #define SID_INSERT_FLD_DATE_FIX (SID_SD_START+358) #define SID_INSERT_FLD_TIME_VAR (SID_SD_START+359) diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index c0ed39b..a67acf1 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2089,11 +2089,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_INSERT_FLD_PAGE_TITLE // ole : no, status : play rec - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] SID_INSERT_FLD_PAGES // ole : no, status : play rec [ ExecMethod = FuTemporary ; diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi index c52311d..1e8991f 100644 --- a/sd/sdi/outlnvsh.sdi +++ b/sd/sdi/outlnvsh.sdi @@ -393,11 +393,6 @@ interface OutlineView ExecMethod = FuTemporaryModify ; StateMethod = GetMenuState ; ] - SID_INSERT_FLD_PAGE_TITLE // ole : no, status : play rec - [ - ExecMethod = FuTemporaryModify ; - StateMethod = GetMenuState ; - ] SID_INSERT_FLD_PAGES // ole : no, status : play rec [ ExecMethod = FuTemporaryModify ; diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 89b9e5e..60c22ff 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -3494,31 +3494,6 @@ SfxVoidItem InsertPageField SID_INSERT_FLD_PAGE ] //-------------------------------------------------------------------------- -SfxVoidItem InsertPageTitleField SID_INSERT_FLD_PAGE_TITLE -() -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_INSERT; -] - -//-------------------------------------------------------------------------- SfxVoidItem InsertPagesField SID_INSERT_FLD_PAGES () [ diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index cd90a76..ed8e7c2 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -250,31 +250,6 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo) pInfo->SetRepresentation( aRepresentation ); } - else if( dynamic_cast< const SvxPageTitleField* >(pField) ) - { - String aRepresentation; - aRepresentation += sal_Unicode( ' ' ); - - ::sd::ViewShell* pViewSh = pDocShell ? pDocShell->GetViewShell() : NULL; - if(pViewSh == NULL) - { - ::sd::ViewShellBase* pBase = PTR_CAST(::sd::ViewShellBase, SfxViewShell::Current()); - if(pBase) - pViewSh = pBase->GetMainViewShell().get(); - } - if( !pDoc && pViewSh ) - pDoc = pViewSh->GetDoc(); - - bool bMasterView; - SdPage* pPage = GetCurrentPage( pViewSh, pInfo, bMasterView ); - - if( pPage && pDoc && !bMasterView ) - { - aRepresentation = pPage->GetName(); - } - - pInfo->SetRepresentation( aRepresentation ); - } else if( dynamic_cast< const SvxPagesField* >(pField) ) { String aRepresentation; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index 53eb037..d474872 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -1850,7 +1850,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) case SID_INSERT_FLD_TIME_VAR: case SID_INSERT_FLD_AUTHOR: case SID_INSERT_FLD_PAGE: - case SID_INSERT_FLD_PAGE_TITLE: case SID_INSERT_FLD_PAGES: case SID_INSERT_FLD_FILE: { @@ -1893,12 +1892,6 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_INSERT_FLD_PAGE_TITLE: - { - pFieldItem = new SvxFieldItem( SvxPageTitleField(), EE_FEATURE_FIELD ); - } - break; - case SID_INSERT_FLD_PAGES: { pFieldItem = new SvxFieldItem( SvxPagesField(), EE_FEATURE_FIELD ); diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index aebf112..d3651b0 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -1063,7 +1063,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_FLD_TIME_VAR ); rSet.DisableItem( SID_INSERT_FLD_AUTHOR ); rSet.DisableItem( SID_INSERT_FLD_PAGE ); - rSet.DisableItem( SID_INSERT_FLD_PAGE_TITLE ); rSet.DisableItem( SID_INSERT_FLD_PAGES ); rSet.DisableItem( SID_INSERT_FLD_FILE ); diff --git a/sd/source/ui/view/outlnvs2.cxx b/sd/source/ui/view/outlnvs2.cxx index bdf4cde8..93db7ea 100644 --- a/sd/source/ui/view/outlnvs2.cxx +++ b/sd/source/ui/view/outlnvs2.cxx @@ -486,7 +486,6 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) case SID_INSERT_FLD_TIME_VAR: case SID_INSERT_FLD_AUTHOR: case SID_INSERT_FLD_PAGE: - case SID_INSERT_FLD_PAGE_TITLE: case SID_INSERT_FLD_PAGES: case SID_INSERT_FLD_FILE: { @@ -526,12 +525,6 @@ void OutlineViewShell::FuTemporaryModify(SfxRequest &rReq) pFieldItem = new SvxFieldItem( SvxPageField(), EE_FEATURE_FIELD ); break; - case SID_INSERT_FLD_PAGE_TITLE: - { - pFieldItem = new SvxFieldItem( SvxPageTitleField(), EE_FEATURE_FIELD ); - } - break; - case SID_INSERT_FLD_PAGES: pFieldItem = new SvxFieldItem( SvxPagesField(), EE_FEATURE_FIELD ); break; diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml b/sd/uiconfig/sdraw/menubar/menubar.xml index 1b2d7d7..85ea0e0 100644 --- a/sd/uiconfig/sdraw/menubar/menubar.xml +++ b/sd/uiconfig/sdraw/menubar/menubar.xml @@ -154,7 +154,6 @@ - diff --git a/sd/uiconfig/simpress/menubar/menubar.xml b/sd/uiconfig/simpress/menubar/menubar.xml index 7d2972b..5d6a24a 100644 --- a/sd/uiconfig/simpress/menubar/menubar.xml +++ b/sd/uiconfig/simpress/menubar/menubar.xml @@ -171,9 +171,8 @@ - - - + +