summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/objcont.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/doc/objcont.cxx')
-rw-r--r--sfx2/source/doc/objcont.cxx138
1 files changed, 28 insertions, 110 deletions
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 1e545e4f6b..cb09d9c774 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -118,16 +119,14 @@ bool operator> (const util::DateTime& i_rLeft, const util::DateTime& i_rRight)
return sal_False;
}
-
::boost::shared_ptr<GDIMetaFile>
SfxObjectShell::GetPreviewMetaFile( sal_Bool bFullContent ) const
{
- return CreatePreviewMetaFile_Impl( bFullContent, sal_False );
+ return CreatePreviewMetaFile_Impl( bFullContent );
}
-
::boost::shared_ptr<GDIMetaFile>
-SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHighContrast ) const
+SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent ) const
{
// Nur wenn gerade nicht gedruckt wird, darf DoDraw aufgerufen
// werden, sonst wird u.U. der Printer abgeschossen !
@@ -142,10 +141,6 @@ SfxObjectShell::CreatePreviewMetaFile_Impl( sal_Bool bFullContent, sal_Bool bHig
VirtualDevice aDevice;
aDevice.EnableOutput( FALSE );
- // adjust the output device if HC-metafile is requested
- if ( bHighContrast )
- aDevice.SetDrawMode( aDevice.GetDrawMode() | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT );
-
MapMode aMode( ((SfxObjectShell*)this)->GetMapUnit() );
aDevice.SetMapMode( aMode );
pFile->SetPrefMapMode( aMode );
@@ -328,11 +323,9 @@ void SfxObjectShell::SetOrganizerSearchMask(
//--------------------------------------------------------------------
-USHORT SfxObjectShell::GetContentCount(
- USHORT nIdx1,
- USHORT /*nIdx2*/)
+sal_uInt16 SfxObjectShell::GetContentCount(sal_uInt16 nIdx)
{
- switch(nIdx1)
+ switch(nIdx)
{
case INDEX_IGNORE:
return DEF_CONTENT_COUNT;
@@ -346,20 +339,14 @@ USHORT SfxObjectShell::GetContentCount(
}
case CONTENT_MACRO:
break;
-/*
- case CONTENT_CONFIG:
- return ( GetConfigManager() ) ?
- GetConfigManager()->GetItemCount() : 0;
- break;
- */
}
return 0;
}
//--------------------------------------------------------------------
-//TODO/CLEANUP: remove this method (it's virtual)
-void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
+//TODO/CLEANUP: remove this method
+void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2)
{
if(nIdx1==CONTENT_STYLE && nIdx2 != INDEX_IGNORE) //StyleSheets
{
@@ -368,23 +355,18 @@ void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT)
}
}
-BOOL SfxObjectShell::CanHaveChilds(USHORT nIdx1,
- USHORT nIdx2)
+sal_Bool SfxObjectShell::CanHaveChilds(sal_uInt16 nIdx1, sal_uInt16 nIdx2)
{
- switch(nIdx1) {
+ switch(nIdx1)
+ {
case INDEX_IGNORE:
- return TRUE;
+ return true;
case CONTENT_STYLE:
- return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool()? FALSE: TRUE;
+ return INDEX_IGNORE == nIdx2 || !GetStyleSheetPool() ? false : true;
case CONTENT_MACRO:
-//!! return INDEX_IGNORE == nIdx2? FALSE: TRUE;
- return FALSE;
-/*
- case CONTENT_CONFIG:
- return INDEX_IGNORE == nIdx2 ? FALSE : TRUE;
- */
+ return false;
}
- return FALSE;
+ return false;
}
//--------------------------------------------------------------------
@@ -392,29 +374,14 @@ BOOL SfxObjectShell::CanHaveChilds(USHORT nIdx1,
void SfxObjectShell::GetContent(String &rText,
Bitmap &rClosedBitmap,
Bitmap &rOpenedBitmap,
- BOOL &bCanDel,
- USHORT i,
- USHORT nIdx1,
- USHORT nIdx2 )
-{
- DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" );
- SfxObjectShell::GetContent( rText, rClosedBitmap, rOpenedBitmap, BMP_COLOR_NORMAL, bCanDel, i, nIdx1, nIdx2 );
-}
-
-//--------------------------------------------------------------------
-
-void SfxObjectShell::GetContent(String &rText,
- Bitmap &rClosedBitmap,
- Bitmap &rOpenedBitmap,
- BmpColorMode eColorMode,
- BOOL &bCanDel,
- USHORT i,
- USHORT nIdx1,
- USHORT /*nIdx2*/ )
+ sal_Bool &bCanDel,
+ sal_uInt16 i,
+ sal_uInt16 nIdx
+)
{
- bCanDel=TRUE;
+ bCanDel=true;
- switch(nIdx1)
+ switch(nIdx)
{
case INDEX_IGNORE:
{
@@ -425,37 +392,14 @@ void SfxObjectShell::GetContent(String &rText,
{
case CONTENT_STYLE:
nTextResId = STR_STYLES;
- if ( eColorMode == BMP_COLOR_NORMAL )
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED;
- nOpenedBitmapResId= BMP_STYLES_OPENED;
- }
- else
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
- nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
- }
+ nClosedBitmapResId= BMP_STYLES_CLOSED;
+ nOpenedBitmapResId= BMP_STYLES_OPENED;
break;
case CONTENT_MACRO:
nTextResId = STR_MACROS;
- if ( eColorMode == BMP_COLOR_NORMAL )
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED;
- nOpenedBitmapResId= BMP_STYLES_OPENED;
- }
- else
- {
- nClosedBitmapResId= BMP_STYLES_CLOSED_HC;
- nOpenedBitmapResId= BMP_STYLES_OPENED_HC;
- }
- break;
-/*
- case CONTENT_CONFIG:
- nTextResId = STR_CONFIG;
nClosedBitmapResId= BMP_STYLES_CLOSED;
nOpenedBitmapResId= BMP_STYLES_OPENED;
break;
- */
}
if ( nTextResId )
@@ -476,52 +420,32 @@ void SfxObjectShell::GetContent(String &rText,
bCanDel=((pStyle->GetMask() & SFXSTYLEBIT_USERDEF)
== SFXSTYLEBIT_USERDEF);
rClosedBitmap = rOpenedBitmap =
- GetStyleFamilyBitmap(pStyle->GetFamily(), eColorMode );
+ GetStyleFamilyBitmap(pStyle->GetFamily());
}
break;
case CONTENT_MACRO:
break;
-/*
- case CONTENT_CONFIG:
- if ( GetConfigManager() )
- {
- rText = GetConfigManager()->GetItem(i);
- bCanDel = GetConfigManager()->CanDelete(i);
- }
- else
- rText = String();
- rClosedBitmap = Bitmap(SfxResId(BMP_STYLES_CLOSED));
- rOpenedBitmap = Bitmap(SfxResId(BMP_STYLES_OPENED));
- break;
-*/
}
}
//--------------------------------------------------------------------
-Bitmap SfxObjectShell::GetStyleFamilyBitmap( SfxStyleFamily eFamily )
-{
- DBG_ERRORFILE( "Non high contrast method called. Please update calling code!" );
- return SfxObjectShell::GetStyleFamilyBitmap( eFamily, BMP_COLOR_NORMAL );
-}
-//--------------------------------------------------------------------
-
-Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily, BmpColorMode eColorMode )
+Bitmap SfxObjectShell::GetStyleFamilyBitmap(SfxStyleFamily eFamily)
{
USHORT nResId = 0;
switch(eFamily)
{
case SFX_STYLE_FAMILY_CHAR:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY1 : BMP_STYLES_FAMILY1_HC;
+ nResId = BMP_STYLES_FAMILY1;
break;
case SFX_STYLE_FAMILY_PARA:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY2 : BMP_STYLES_FAMILY2_HC;
+ nResId = BMP_STYLES_FAMILY2;
break;
case SFX_STYLE_FAMILY_FRAME:
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY3 : BMP_STYLES_FAMILY3_HC;
+ nResId = BMP_STYLES_FAMILY3;
break;
case SFX_STYLE_FAMILY_PAGE :
- nResId = ( eColorMode == BMP_COLOR_NORMAL ) ? BMP_STYLES_FAMILY4 : BMP_STYLES_FAMILY4_HC;
+ nResId = BMP_STYLES_FAMILY4;
break;
case SFX_STYLE_FAMILY_PSEUDO:
case SFX_STYLE_FAMILY_ALL:
@@ -750,10 +674,6 @@ BOOL SfxObjectShell::Print
USHORT /*nIdx3*/,
const String* pObjectName
)
-
-/* [Beschreibung]
-*/
-
{
switch(nIdx1)
{
@@ -763,7 +683,6 @@ BOOL SfxObjectShell::Print
SetOrganizerSearchMask(pStylePool);
SfxStyleSheetIterator* pIter = pStylePool->CreateIterator(
pStylePool->GetSearchFamily(), pStylePool->GetSearchMask() );
- USHORT nStyles = pIter->Count();
SfxStyleSheetBase *pStyle = pIter->First();
if ( !pStyle )
return TRUE;
@@ -793,7 +712,6 @@ BOOL SfxObjectShell::Print
aOutPos.Y() += nTextHeight;
aOutPos.Y() += nTextHeight/2;
aFont.SetSize(Size(0, 35)); // 10pt
- nStyles = 1;
while(pStyle)
{
// print template name
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 12:01:17 +0000