strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changefileheader2: #i10000#: convert files with CR/LF characters to CR only

Browse source
This commit is contained in:
Jens-Heiner Rechtien 2010-02-12 16:56:44 +01:00
parent 41578d9fd1
commit e095da0ff0
11 changed files with 128 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sd/source/ui/dlg/dlgass.cxx
View file

@ -301,8 +301,8 @@ public:
OKButton maFinishButton;
SdDocPreviewWin maPreview;
String maCreateStr;
String maOpenStr;
String maCreateStr;
String maOpenStr;
// Seite 1
FixedBitmap* mpPage1FB;
@ -382,8 +382,8 @@ AssistentDlgImpl::AssistentDlgImpl( ::Window* pWindow, const Link& rFinishLink,
maLastPageButton(pWindow,SdResId(BUT_LAST)),
maNextPageButton(pWindow,SdResId(BUT_NEXT)),
maFinishButton(pWindow,SdResId(BUT_FINISH)),
maPreview(pWindow,SdResId(CT_PREVIEW)),
maCreateStr(SdResId(STR_CREATE)),
maPreview(pWindow,SdResId(CT_PREVIEW)),
maCreateStr(SdResId(STR_CREATE)),
maOpenStr(SdResId(STR_OPEN))
{
maPageListFile += sal_Unicode('?'),
@ -971,9 +971,9 @@ void AssistentDlgImpl::SetStartType( StartType eType )
mpPage1OpenLB->Show(eType == ST_OPEN);
mpPage1OpenPB->Show(eType == ST_OPEN);
if (eType == ST_OPEN)
maFinishButton.SetText(maOpenStr);
else
if (eType == ST_OPEN)
maFinishButton.SetText(maOpenStr);
else
maFinishButton.SetText(maCreateStr);
}

16
sd/source/ui/dlg/dlgass.src
View file

@ -531,14 +531,14 @@ ModalDialog DLG_ASS
Text [ en-US ] = "~Create" ;
};
String STR_OPEN
{
Text [ en-US ] = "~Open";
};
String STR_CREATE
{
Text [ en-US ] = "~Create" ;
String STR_OPEN
{
Text [ en-US ] = "~Open";
};
String STR_CREATE
{
Text [ en-US ] = "~Create" ;
};
};

6
sd/source/ui/dlg/prltempl.cxx
View file

@ -168,9 +168,9 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
AddTabPage( RID_SVXPAGE_CHAR_EFFECTS );
AddTabPage( RID_SVXPAGE_STD_PARAGRAPH );
AddTabPage( RID_SVXPAGE_TEXTATTR );
AddTabPage( RID_SVXPAGE_PICK_BULLET );
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
AddTabPage( RID_SVXPAGE_PICK_BMP );
AddTabPage( RID_SVXPAGE_PICK_BULLET );
AddTabPage( RID_SVXPAGE_PICK_SINGLE_NUM );
AddTabPage( RID_SVXPAGE_PICK_BMP );
AddTabPage( RID_SVXPAGE_NUM_OPTIONS );
AddTabPage( RID_SVXPAGE_TABULATOR );
}

56
sd/source/ui/dlg/prltempl.src
View file

@ -83,35 +83,35 @@ TabDialog TAB_PRES_LAYOUT_TEMPLATE
Text [ en-US ] = "Indents & Spacing" ;
PageResID = RID_SVXPAGE_STD_PARAGRAPH ;
};
PageItem
{
Identifier = RID_SVXPAGE_TEXTATTR ;
PageResID = RID_SVXPAGE_TEXTATTR ;
Text [ en-US ] = "Text" ;
PageItem
{
Identifier = RID_SVXPAGE_TEXTATTR ;
PageResID = RID_SVXPAGE_TEXTATTR ;
Text [ en-US ] = "Text" ;
};
PageItem
{
Identifier = RID_SVXPAGE_PICK_BULLET ;
PageResID = RID_SVXPAGE_PICK_BULLET ;
Text [ en-US ] = "Bullets" ;
};
PageItem
{
Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;
Text [ en-US ] = "Numbering type" ;
};
PageItem
{
Identifier = RID_SVXPAGE_PICK_BMP ;
PageResID = RID_SVXPAGE_PICK_BMP ;
Text [ en-US ] = "Graphics" ;
};
PageItem
{
Identifier = RID_SVXPAGE_NUM_OPTIONS ;
PageResID = RID_SVXPAGE_NUM_OPTIONS ;
Text [ en-US ] = "Customize" ;
PageItem
{
Identifier = RID_SVXPAGE_PICK_BULLET ;
PageResID = RID_SVXPAGE_PICK_BULLET ;
Text [ en-US ] = "Bullets" ;
};
PageItem
{
Identifier = RID_SVXPAGE_PICK_SINGLE_NUM ;
PageResID = RID_SVXPAGE_PICK_SINGLE_NUM ;
Text [ en-US ] = "Numbering type" ;
};
PageItem
{
Identifier = RID_SVXPAGE_PICK_BMP ;
PageResID = RID_SVXPAGE_PICK_BMP ;
Text [ en-US ] = "Graphics" ;
};
PageItem
{
Identifier = RID_SVXPAGE_NUM_OPTIONS ;
PageResID = RID_SVXPAGE_NUM_OPTIONS ;
Text [ en-US ] = "Customize" ;
};
PageItem
{

2
sd/source/ui/inc/Window.hxx
View file

@ -209,7 +209,7 @@ protected:
::com::sun::star::accessibility::XAccessible>
CreateAccessible (void);
XubString GetSurroundingText() const;
XubString GetSurroundingText() const;
Selection GetSurroundingTextSelection() const;
};

2
sd/source/ui/inc/taskpane/TitleBar.hxx
View file

@ -89,7 +89,7 @@ public:
virtual void Paint (const Rectangle& rBoundingBox);
virtual bool Expand (bool bFlag = true);
virtual bool IsExpanded (void) const;
virtual void SetEnabledState(bool bFlag);
virtual void SetEnabledState(bool bFlag);
void SetFocus (bool bFlag);

2
sd/source/ui/inc/taskpane/TitledControl.hxx
View file

@ -132,7 +132,7 @@ public:
*/
virtual bool IsExpandable (void) const;
virtual void SetEnabledState(bool bFlag);
virtual void SetEnabledState(bool bFlag);
/** Ownership of the given data remains with the caller. The data
is thus not destroyed when the destructor of this class is

38
sd/source/ui/toolpanel/TitleBar.cxx
View file

@ -213,14 +213,14 @@ bool TitleBar::IsExpanded (void) const
}
void TitleBar::SetEnabledState(bool bFlag)
{
if(bFlag)
Enable();
else
Disable();
Invalidate ();
}
void TitleBar::SetEnabledState(bool bFlag)
{
if(bFlag)
Enable();
else
Disable();
Invalidate ();
}
void TitleBar::SetFocus (bool bFlag)
@ -459,17 +459,17 @@ void TitleBar::PaintText (const Rectangle& rTextBox)
USHORT TitleBar::GetTextStyle (void)
{
if(IsEnabled())
{
return TEXT_DRAW_LEFT
| TEXT_DRAW_TOP
| TEXT_DRAW_MULTILINE
| TEXT_DRAW_WORDBREAK;
}
else
{
return TEXT_DRAW_DISABLE;
}
if(IsEnabled())
{
return TEXT_DRAW_LEFT
| TEXT_DRAW_TOP
| TEXT_DRAW_MULTILINE
| TEXT_DRAW_WORDBREAK;
}
else
{
return TEXT_DRAW_DISABLE;
}
}

42
sd/source/ui/toolpanel/TitledControl.cxx
View file

@ -335,27 +335,27 @@ bool TitledControl::IsExpanded (void) const
return false;
}
void TitledControl::SetEnabledState(bool bFlag)
{
if (!bFlag)
{
GetParentNode()->GetControlContainer().SetExpansionState (
this,
ControlContainer::ES_COLLAPSE);
Disable();
}
else
{
/*
GetParentNode()->GetControlContainer().SetExpansionState (
this,
ControlContainer::ES_EXPAND);
*/
Enable();
}
GetTitleBar()->SetEnabledState(bFlag);
}
void TitledControl::SetEnabledState(bool bFlag)
{
if (!bFlag)
{
GetParentNode()->GetControlContainer().SetExpansionState (
this,
ControlContainer::ES_COLLAPSE);
Disable();
}
else
{
/*
GetParentNode()->GetControlContainer().SetExpansionState (
this,
ControlContainer::ES_EXPAND);
*/
Enable();
}
GetTitleBar()->SetEnabledState(bFlag);
}

8
sd/source/ui/view/GraphicObjectBar.cxx
View file

@ -170,10 +170,10 @@ void GraphicObjectBar::ExecuteFilter( SfxRequest& rReq )
aStr.Append( String( SdResId( STR_UNDO_GRAFFILTER ) ) );
mpView->BegUndo( aStr );
pFilteredObj->SetGraphicObject( aFilterObj );
::sd::View* const pView = mpView;
pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
pView->EndUndo();
return;
::sd::View* const pView = mpView;
pView->ReplaceObjectAtView( pObj, *pPageView, pFilteredObj );
pView->EndUndo();
return;
}
}
}

70
sd/source/ui/view/sdwindow.cxx
View file

@ -34,8 +34,8 @@
#include <sfx2/viewfrm.hxx>
#include <svx/outliner.hxx>
#include <svx/outliner.hxx>
#include <svx/editview.hxx>
#include "app.hrc"
@ -1206,38 +1206,38 @@ void Window::DropScroll(const Point& rMousePos)
}
}
XubString Window::GetSurroundingText() const
{
if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
{
return XubString();
}
else if ( mpViewShell->GetView()->IsTextEdit() )
{
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingText();
}
else
{
return XubString();
}
}
Selection Window::GetSurroundingTextSelection() const
{
if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
{
return Selection( 0, 0 );
}
else if ( mpViewShell->GetView()->IsTextEdit() )
{
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingTextSelection();
}
else
{
return Selection( 0, 0 );
}
}
XubString Window::GetSurroundingText() const
{
if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
{
return XubString();
}
else if ( mpViewShell->GetView()->IsTextEdit() )
{
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingText();
}
else
{
return XubString();
}
}
Selection Window::GetSurroundingTextSelection() const
{
if ( mpViewShell->GetShellType() == ViewShell::ST_OUTLINE )
{
return Selection( 0, 0 );
}
else if ( mpViewShell->GetView()->IsTextEdit() )
{
OutlinerView *pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
return pOLV->GetEditView().GetSurroundingTextSelection();
}
else
{
return Selection( 0, 0 );
}
}
} // end of namespace sd