summaryrefslogtreecommitdiff
path: root/sd/source/ui/view/outlnvsh.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/view/outlnvsh.cxx')
-rwxr-xr-xsd/source/ui/view/outlnvsh.cxx103
1 files changed, 3 insertions, 100 deletions
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 955a9d167b49..61f513970662 100755
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -32,7 +32,7 @@
#include "ViewShellImplementation.hxx"
#include <memory>
-
+#include "helpids.h"
#include "app.hrc"
#include <svx/hyprlink.hxx>
#include <svx/hyperdlg.hxx>
@@ -180,8 +180,8 @@ void OutlineViewShell::Construct(DrawDocShell* )
SetName (aName);
SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
- GetActiveWindow()->SetHelpId( SD_IF_SDOUTLINEVIEWSHELL );
- GetActiveWindow()->SetUniqueId( SD_IF_SDOUTLINEVIEWSHELL );
+ GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL );
+ GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL );
}
@@ -1775,103 +1775,6 @@ SdPage* OutlineViewShell::GetActualPage()
}
-/*************************************************************************
-|*
-|* Retrieve range of marked pages
-|*
-\************************************************************************/
-
-String OutlineViewShell::GetPageRangeString()
-{
- ::sd::Window* pWin = GetActiveWindow();
- OutlinerView* pActiveView = pOlView->GetViewByWindow(pWin);
- ::Outliner* pOutl = pActiveView->GetOutliner();
- List* pSelList = (List*)pActiveView->CreateSelectionList();
- Paragraph* pPara = (Paragraph*)pSelList->First();
-
- String aStrPageRange;
- BOOL bFirstPageNo = TRUE;
- BOOL bOpenRange = FALSE;
- USHORT nLastPage = 0;
- USHORT nLastUsedPage = (USHORT)-1;
-
- USHORT nPageCount = 0;
- for( USHORT n = 0; n< GetDoc()->GetPageCount(); n++ )
- if( ( (SdPage*)GetDoc()->GetPage( n ) )->GetPageKind() == PK_STANDARD )
- nPageCount++;
-
- while ( pPara )
- {
- if ( !pOutl->HasParaFlag(pPara, PARAFLAG_ISPAGE) )
- {
- pPara = pOlView->GetPrevTitle(pPara);
- }
- USHORT nPageToSelect = 0;
- while(pPara)
- {
- pPara = pOlView->GetPrevTitle(pPara);
- if (pPara)
- nPageToSelect++;
- }
-
- if( bFirstPageNo )
- {
- bFirstPageNo = FALSE;
- aStrPageRange = String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) );
- nLastUsedPage = nPageToSelect;
- nPageCount--;
- }
- else
- {
- if( nPageToSelect != nLastPage )
- {
- if( nPageToSelect == nLastPage+1 )
- {
- bOpenRange = TRUE;
- nPageCount--;
- }
- else
- {
- if( bOpenRange )
- {
- if( nLastPage == nLastUsedPage+1 )
- aStrPageRange.Append( sal_Unicode(',') );
- else
- aStrPageRange.Append( sal_Unicode('-') );
-
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
- }
- aStrPageRange.Append( sal_Unicode(',') );
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nPageToSelect+1 ) ) );
- nLastUsedPage = nPageToSelect;
- bOpenRange = FALSE;
- nPageCount--;
- }
- }
- }
-
- nLastPage = nPageToSelect;
- pPara = (Paragraph*)pSelList->Next();
- }
-
- if( bOpenRange )
- {
- if( nLastPage == nLastUsedPage+1 )
- aStrPageRange.Append( sal_Unicode(',') );
- else
- aStrPageRange.Append( sal_Unicode('-') );
-
- aStrPageRange.Append( String::CreateFromInt32( sal_Int32( nLastPage+1 ) ) );
- }
-
- if( nPageCount == 0 )
- aStrPageRange.Erase();
-
- delete pSelList; // die wurde extra fuer uns erzeugt
-
- return aStrPageRange;
-}
-
void OutlineViewShell::UpdatePreview( SdPage* pPage, BOOL )
{
const bool bNewPage = pPage != pLastPage;