summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-04-04 13:22:51 +0000
committerKurt Zenker <kz@openoffice.org>2008-04-04 13:22:51 +0000
commitaed2eac2245bead70c2e2ada1639fcc4a7ef7583 (patch)
tree41a142008d3d1fbb3181492b8d529b5d89235994 /sfx2
parent34eaf0d5e663c8108da7ad3e7c5e2400ac90ff55 (diff)
INTEGRATION: CWS titles02 (1.91.72); FILE MERGED
2008/02/12 13:28:59 as 1.91.72.3: RESYNC: (1.92-1.94); FILE MERGED 2007/12/04 10:09:45 as 1.91.72.2: RESYNC: (1.91-1.92); FILE MERGED 2007/10/12 13:09:26 as 1.91.72.1: #116375# support new title feature
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/view/topfrm.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/sfx2/source/view/topfrm.cxx b/sfx2/source/view/topfrm.cxx
index 03574f6c18..066a3ea6bb 100644
--- a/sfx2/source/view/topfrm.cxx
+++ b/sfx2/source/view/topfrm.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: topfrm.cxx,v $
*
- * $Revision: 1.94 $
+ * $Revision: 1.95 $
*
- * last change: $Author: rt $ $Date: 2008-01-29 16:28:44 $
+ * last change: $Author: kz $ $Date: 2008-04-04 14:22:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -592,7 +592,11 @@ SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHi
// append TAB string if available
aTitle += _getTabString();
+ /* AS_TITLE
pWindow->SetText( aTitle );
+ */
+
+ /* AS_ICON
if( pWindow->GetType() == WINDOW_WORKWINDOW )
{
SvtModuleOptions::EFactory eFactory;
@@ -602,6 +606,7 @@ SfxTopFrame* SfxTopFrame::Create( SfxObjectShell* pDoc, USHORT nViewId, BOOL bHi
pWorkWindow->SetIcon( (sal_uInt16) SvtModuleOptions().GetFactoryIcon( eFactory ) );
}
}
+ */
}
pFrame->SetItemSet_Impl( pSet );
@@ -1160,9 +1165,11 @@ String SfxTopViewFrame::UpdateTitle()
GetBindings().Invalidate( SID_NEWDOCDIRECT );
+ /* AS_TITLE
Window* pWindow = GetTopFrame_Impl()->GetTopWindow_Impl();
if ( pWindow && pWindow->GetText() != aTitle )
pWindow->SetText( aTitle );
+ */
return aTitle;
}