Skip to content

C
core
Kaydet (Commit) 35c31f5f authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert document recovery dialog to .ui 

and move sidebar global resource defines up to the toplevel so its harder to
collide with them and adjust the define to indicate the next free resource
id.

and simplify the dialog down a good bit and remove intermediate classes
etc.

Change-Id: I8d6db17fcdfc86457368d7f432bd96f6f3aa182d
üst 8fd0320e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 125 additions and 307 deletions
include/svx/dialogs.hrc
Dosyayı görüntüle @ 35c31f5f
......@@ -980,11 +980,57 @@
#define RID_SVXBMP_ZOOM_PAGE (SVX_OOO_BUILD_START + 9) // 1239
#define RID_SVXSTR_FIT_SLIDE (SVX_OOO_BUILD_START + 10) // 1240
// sidebar-related resources (defined in the appropriate .hrc's)
// sidebar-related resources
#define RID_SVX_SIDEBAR_BEGIN (RID_SVX_START + 1241)
#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 2)
#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 3)
#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 4)
#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 5)
#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 6)
#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 7)
#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 8)
#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 9)
#define IMG_PARA_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 10)
#define IMG_PARA_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 11)
#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 12)
#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 13)
#define IMG_LINE_COLOR (RID_SVX_SIDEBAR_BEGIN + 20)
#define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
#define IMG_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22)
#define IMG_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23)
#define IMG_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24)
#define IMG_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25)
#define IMG_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26)
#define IMG_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27)
#define IMG_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28)
#define IMG_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29)
#define IMG_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30)
#define IMG_ELLI (RID_SVX_SIDEBAR_BEGIN + 31)
#define IMG_QUAD (RID_SVX_SIDEBAR_BEGIN + 32)
#define IMG_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33)
#define IMG_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34)
#define IMG_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35)
#define IMG_AREA_COLOR (RID_SVX_SIDEBAR_BEGIN + 36)
#define IMG_ROT_LEFT (RID_SVX_SIDEBAR_BEGIN + 37)
#define IMG_ROT_RIGHT (RID_SVX_SIDEBAR_BEGIN + 38)
#define RID_SVX_SIDEBAR_END (RID_SVX_START + 1279)
#define RID_SVXIMG_GREENCHECK (RID_SVX_START + 1280)
#define RID_SVXIMG_YELLOWCHECK (RID_SVX_START + 1281)
#define RID_SVXIMG_REDCROSS (RID_SVX_START + 1282)
#define RID_SVXSTR_SUCCESSRECOV (RID_SVX_START + 1283)
#define RID_SVXSTR_ORIGDOCRECOV (RID_SVX_START + 1284)
#define RID_SVXSTR_RECOVFAILED (RID_SVX_START + 1285)
#define RID_SVXSTR_RECOVINPROGR (RID_SVX_START + 1286)
#define RID_SVXSTR_NOTRECOVYET (RID_SVX_START + 1287)
#define RID_SVXSTR_RECOVERY_INPROGRESS (RID_SVX_START + 1288)
#define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289)
#define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290)
// !!! IMPORTANT: consider and update RID_SVXSTR_NEXTFREE when introducing new RIDs for Strings !!!
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1271)
#define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1291)
// if we have _a_lot_ time, we should group the resource ids by type, instead
// of grouping them by semantics. The reason is that resource ids have to be
......@@ -1008,8 +1054,6 @@
#define RID_SVX_TABDLG_DOCRECOVERY ( RID_SVX_START + 0 )
#define RID_SVXPAGE_DOCRECOVERY_RECOVER ( RID_SVX_START + 9 )
// !!!! double defined ID's (see below) !!!
#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
......
svx/UIConfig_svx.mk
Dosyayı görüntüle @ 35c31f5f
......@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/compressgraphicdialog \
svx/uiconfig/ui/deleteheaderdialog \
svx/uiconfig/ui/deletefooterdialog \
svx/uiconfig/ui/docrecoveryrecoverdialog \
svx/uiconfig/ui/docrecoverysavedialog \
svx/uiconfig/ui/extrustiondepthdialog \
svx/uiconfig/ui/findreplacedialog \
......
svx/source/dialog/docrecovery.hrc
Dosyayı görüntüle @ 35c31f5f
......@@ -65,32 +65,6 @@
#define SAVEPROGR_CONTROLWIDTH (SAVEPROGR_COL1-SAVEPROGR_COL0)
#define SAVEPROGR_HEIGHT (SAVEPROGR_ROW3+RSC_SP_DLG_INNERBORDER_BOTTOM)
// TabPage Recovery
#define WIN_RECOV_TITLE 1
#define FT_RECOV_TITLE 2
#define FL_RECOV_TITLE 3
#define FT_RECOV_DESCR 4
#define FT_RECOV_PROGR 5
#define WIN_RECOV_PROGR 6
#define FT_RECOV_FILELIST 7
#define LB_RECOV_FILELIST 8
#define FL_RECOV_BOTTOM 9
#define BTN_RECOV_NEXT 11
#define BTN_RECOV_CANCEL 12
#define STR_HEADERBAR 13
#define IMG_GREENCHECK 14
#define IMG_YELLOWCHECK 15
#define IMG_REDCROSS 16
#define STR_SUCCESSRECOV 20
#define STR_ORIGDOCRECOV 21
#define STR_RECOVFAILED 22
#define STR_RECOVINPROGR 23
#define STR_NOTRECOVYET 24
#define STR_RECOVERY_INPROGRESS 26
#define STR_RECOVERYONLY_FINISH_DESCR 28
#define STR_RECOVERYONLY_FINISH 29
#define RECOV_WIDTH SAVE_WIDTH
#define RECOV_HEIGHT SAVE_HEIGHT
#define RECOV_TITLEWINHEIGHT SAVE_TITLEWINHEIGHT
......
svx/source/dialog/docrecovery.src
Dosyayı görüntüle @ 35c31f5f
......@@ -63,129 +63,6 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_PROGR
};
};
TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER
{
Size = MAP_APPFONT( RECOV_WIDTH, RECOV_HEIGHT );
HelpId = HID_SVX_TP_DOCRECOVERY_RECOVER;
OutputSize = TRUE;
SVLook = TRUE;
Hide = TRUE;
Window WIN_RECOV_TITLE
{
Pos = MAP_APPFONT( 0 , 0 );
Size = MAP_APPFONT( RECOV_WIDTH, RECOV_TITLEWINHEIGHT );
};
FixedText FT_RECOV_TITLE
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW0 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
Text[ en-US ] = "%PRODUCTNAME Document Recovery";
};
FixedLine FL_RECOV_TITLE
{
Pos = MAP_APPFONT( 0 , RECOV_TITLEWINHEIGHT );
Size = MAP_APPFONT( RECOV_WIDTH, 2 );
};
FixedText FT_RECOV_DESCR
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW2 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_DESCRHEIGHT );
WordBreak = TRUE;
Text[ en-US ] = "Press 'Start Recovery' to start the recovery process of the documents listed below.\n\nThe 'Status' column shows whether the document can be recovered.";
};
FixedText FT_RECOV_PROGR
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW3 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
Text[ en-US ] = "Recovering document:";
};
Window WIN_RECOV_PROGR
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW4 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, PROGR_HEIGHT );
Border = TRUE;
};
FixedText FT_RECOV_FILELIST
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW5 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RSC_CD_FIXEDTEXT_HEIGHT );
Text[ en-US ] = "Status of recovered documents:";
};
String STR_HEADERBAR
{
Text[ en-US ] = "Document Name\tStatus";
};
Control LB_RECOV_FILELIST
{
Pos = MAP_APPFONT( RECOV_COL1, RECOV_ROW6 );
Size = MAP_APPFONT( RECOV_CONTROLWIDTH, RECOV_FILELISTHEIGHT );
Border = TRUE;
SVLook = TRUE;
};
FixedLine FL_RECOV_BOTTOM
{
Pos = MAP_APPFONT( 0 , RECOV_ROW8 );
Size = MAP_APPFONT( RECOV_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
};
PushButton BTN_RECOV_NEXT
{
HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT";
Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT );
Text[ en-US ] = "~Start Recovery >";
DefButton = TRUE;
};
CancelButton BTN_RECOV_CANCEL
{
Pos = MAP_APPFONT( RECOV_COL_F, RECOV_ROW9 );
Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
};
Image IMG_GREENCHECK
{
ImageBitmap = Bitmap { File = "nu01.png"; };
};
Image IMG_YELLOWCHECK
{
ImageBitmap = Bitmap { File = "nu04.png"; };
};
Image IMG_REDCROSS
{
ImageBitmap = Bitmap { File = "nu02.png"; };
};
String STR_SUCCESSRECOV
{
Text[ en-US ] = "Successfully recovered";
};
String STR_ORIGDOCRECOV
{
Text[ en-US ] = "Original document recovered";
};
String STR_RECOVFAILED
{
Text[ en-US ] = "Recovery failed";
};
String STR_RECOVINPROGR
{
Text[ en-US ] = "Recovery in progress";
};
String STR_NOTRECOVYET
{
Text[ en-US ] = "Not recovered yet";
};
String STR_RECOVERY_INPROGRESS
{
Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your documents. Depending on the size of the documents this process can take some time." ;
};
String STR_RECOVERYONLY_FINISH_DESCR
{
Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' to see your documents.";
};
String STR_RECOVERYONLY_FINISH
{
Text[ en-US ] = "~Finish";
};
};
QueryBox RID_SVXQB_EXIT_RECOVERY
{
BUTTONS = WB_YES_NO ;
......
svx/source/dialog/sdstring.src
Dosyayı görüntüle @ 35c31f5f
......@@ -2089,4 +2089,59 @@ String RID_SVXSTR_VIEW
Text [ en-US ] = "List" ;
};
Image RID_SVXIMG_GREENCHECK
{
ImageBitmap = Bitmap { File = "nu01.png"; };
};
Image RID_SVXIMG_YELLOWCHECK
{
ImageBitmap = Bitmap { File = "nu04.png"; };
};
Image RID_SVXIMG_REDCROSS
{
ImageBitmap = Bitmap { File = "nu02.png"; };
};
String RID_SVXSTR_SUCCESSRECOV
{
Text[ en-US ] = "Successfully recovered";
};
String RID_SVXSTR_ORIGDOCRECOV
{
Text[ en-US ] = "Original document recovered";
};
String RID_SVXSTR_RECOVFAILED
{
Text[ en-US ] = "Recovery failed";
};
String RID_SVXSTR_RECOVINPROGR
{
Text[ en-US ] = "Recovery in progress";
};
String RID_SVXSTR_NOTRECOVYET
{
Text[ en-US ] = "Not recovered yet";
};
String RID_SVXSTR_RECOVERY_INPROGRESS
{
Text[ en-US ] = "%PRODUCTNAME %PRODUCTVERSION will start to recover your documents. Depending on the size of the documents this process can take some time." ;
};
String RID_SVXSTR_RECOVERYONLY_FINISH_DESCR
{
Text[ en-US ] = "Recovery of your documents was finished.\nClick 'Finish' to see your documents.";
};
String RID_SVXSTR_RECOVERYONLY_FINISH
{
Text[ en-US ] = "~Finish";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/inc/docrecovery.hxx
Dosyayı görüntüle @ 35c31f5f
......@@ -302,11 +302,8 @@ class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener
class PluginProgressWindow : public Window
{
private:
css::uno::Reference< css::lang::XComponent > m_xProgress;
public:
PluginProgressWindow( Window* pParent ,
const css::uno::Reference< css::lang::XComponent >& xProgress);
virtual ~PluginProgressWindow();
......@@ -315,11 +312,8 @@ class PluginProgressWindow : public Window
class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator ,
css::lang::XComponent >
{
// member
private:
/** @short TODO */
css::uno::Reference< css::task::XStatusIndicatorFactory > m_xProgressFactory;
......@@ -330,8 +324,6 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat
// native interface
public:
/** @short TODO */
PluginProgress( Window* pParent,
const css::uno::Reference< css::uno::XComponentContext >& xContext );
......@@ -374,60 +366,6 @@ class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicat
throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
class IExtendedTabPage : public TabPage
{
// member
protected:
short m_nResult;
// interface
public:
IExtendedTabPage( Window* pParent, WinBits nStyle = 0 )
: TabPage( pParent, nStyle )
, m_nResult(DLG_RET_UNKNOWN)
{}
IExtendedTabPage( Window* pParent, const ResId& rResId )
: TabPage( pParent, rResId )
, m_nResult(DLG_RET_UNKNOWN)
{}
virtual ~IExtendedTabPage()
{}
virtual short execute() = 0;
virtual void setDefButton() = 0;
};
typedef ::std::vector< IExtendedTabPage* > TTabPageList;
class TabDialog4Recovery : public TabDialog
{
// member
private:
TTabPageList m_lTabPages;
TTabPageList::iterator m_pActualPage;
// interface
public:
TabDialog4Recovery(Window* pParent);
virtual ~TabDialog4Recovery();
virtual void addTabPage(IExtendedTabPage* pPage);
virtual short Execute() SAL_OVERRIDE;
};
class SaveDialog : public Dialog
{
// member
......@@ -568,24 +506,17 @@ class RecovDocList : public SvSimpleTable
};
class RecoveryDialog : public IExtendedTabPage
class RecoveryDialog : public Dialog
, public IRecoveryUpdateListener
{
// member
private:
FixedText m_aTitleFT;
Window m_aTitleWin;
FixedLine m_aTitleFL;
FixedText m_aDescrFT;
FixedText m_aProgressFT;
Window m_aProgrParent;
FixedText m_aFileListFT;
SvSimpleTableContainer m_aFileListLBContainer;
RecovDocList m_aFileListLB;
FixedLine m_aBottomFL;
PushButton m_aNextBtn;
CancelButton m_aCancelBtn;
FixedText* m_pTitleFT;
FixedText* m_pDescrFT;
Window* m_pProgrParent;
RecovDocList* m_pFileListLB;
PushButton* m_pNextBtn;
CancelButton* m_pCancelBtn;
OUString m_aTitleRecoveryInProgress;
OUString m_aRecoveryOnlyFinish;
OUString m_aRecoveryOnlyFinishDescr;
......@@ -605,44 +536,27 @@ class RecoveryDialog : public IExtendedTabPage
E_RECOVERY_HANDLED // the recovery wizard page was shown already ... and will be shown now again ...
};
sal_Int32 m_eRecoveryState;
bool m_bWaitForUser;
bool m_bWaitForCore;
bool m_bUserDecideNext;
bool m_bWasRecoveryStarted;
// member
public:
/** @short TODO */
RecoveryDialog(Window* pParent,
RecoveryCore* pCore );
/** @short TODO */
virtual ~RecoveryDialog();
// IRecoveryUpdateListener
virtual void updateItems() SAL_OVERRIDE;
virtual void stepNext(TURLInfo* pItem) SAL_OVERRIDE;
virtual void start() SAL_OVERRIDE;
virtual void end() SAL_OVERRIDE;
/** @short TODO */
virtual short execute() SAL_OVERRIDE;
/** @short TODO*/
virtual void setDefButton() SAL_OVERRIDE;
short execute();
// helper
private:
/** @short TODO */
DECL_LINK(NextButtonHdl, void*);
DECL_LINK(CancelButtonHdl, void*);
......
svx/source/sidebar/area/AreaPropertyPanel.cxx
Dosyayı görüntüle @ 35c31f5f
......@@ -98,7 +98,7 @@ AreaPropertyPanel::AreaPropertyPanel(
maImgRadial(SVX_RES(IMG_RADIAL)),
maImgSquare(SVX_RES(IMG_SQUARE)),
maImgLinear(SVX_RES(IMG_LINEAR)),
maImgColor(SVX_RES(IMG_COLOR)),
maImgColor(SVX_RES(IMG_AREA_COLOR)),
maTrGrPopup(this, ::boost::bind(&AreaPropertyPanel::CreateTransparencyGradientControl, this, _1)),
maColorPopup(this, ::boost::bind(&AreaPropertyPanel::CreateColorPopupControl, this, _1)),
mpFloatTransparenceItem(),
......
svx/source/sidebar/area/AreaPropertyPanel.hrc
Dosyayı görüntüle @ 35c31f5f
......@@ -44,18 +44,6 @@
#define BTN_LEFT_SECOND 22
#define BTN_RIGHT_FIRST 23
// global definitions
#define IMG_AXIAL (RID_SVX_SIDEBAR_BEGIN + 30)
#define IMG_ELLI (RID_SVX_SIDEBAR_BEGIN + 31)
#define IMG_QUAD (RID_SVX_SIDEBAR_BEGIN + 32)
#define IMG_RADIAL (RID_SVX_SIDEBAR_BEGIN + 33)
#define IMG_SQUARE (RID_SVX_SIDEBAR_BEGIN + 34)
#define IMG_LINEAR (RID_SVX_SIDEBAR_BEGIN + 35)
#define IMG_COLOR (RID_SVX_SIDEBAR_BEGIN + 36)
#define IMG_ROT_LEFT (RID_SVX_SIDEBAR_BEGIN + 37)
#define IMG_ROT_RIGHT (RID_SVX_SIDEBAR_BEGIN + 38)
#define STR_HELP_COLOR 41
#define FIXED_TEXT_HEIGHT 9
......
svx/source/sidebar/area/AreaPropertyPanel.src
Dosyayı görüntüle @ 35c31f5f
......@@ -48,7 +48,7 @@ Image IMG_LINEAR
{
ImageBitmap = Bitmap{File = "symphony/linear.png";};
};
Image IMG_COLOR
Image IMG_AREA_COLOR
{
ImageBitmap = Bitmap{File = "symphony/fill_color.png";};
};
......
svx/source/sidebar/line/LinePropertyPanel.cxx
Dosyayı görüntüle @ 35c31f5f
......@@ -178,7 +178,7 @@ LinePropertyPanel::LinePropertyPanel(
mpEndItem(0),
maColorPopup(this, ::boost::bind(&LinePropertyPanel::CreateColorPopupControl, this, _1)),
maLineWidthPopup(this, ::boost::bind(&LinePropertyPanel::CreateLineWidthPopupControl, this, _1)),
maIMGColor(SVX_RES(IMG_COLOR)),
maIMGColor(SVX_RES(IMG_LINE_COLOR)),
maIMGNone(SVX_RES(IMG_NONE_ICON)),
mpIMGWidthIcon(),
mxFrame(rxFrame),
......
svx/source/sidebar/line/LinePropertyPanel.hrc
Dosyayı görüntüle @ 35c31f5f
......@@ -25,18 +25,6 @@
#define STR_QH_TB_WIDTH 15
#define STR_QH_TB_COLOR 16
#define IMG_COLOR (RID_SVX_SIDEBAR_BEGIN + 20)
#define IMG_NONE_ICON (RID_SVX_SIDEBAR_BEGIN + 21)
#define IMG_WIDTH1_ICON (RID_SVX_SIDEBAR_BEGIN + 22)
#define IMG_WIDTH2_ICON (RID_SVX_SIDEBAR_BEGIN + 23)
#define IMG_WIDTH3_ICON (RID_SVX_SIDEBAR_BEGIN + 24)
#define IMG_WIDTH4_ICON (RID_SVX_SIDEBAR_BEGIN + 25)
#define IMG_WIDTH5_ICON (RID_SVX_SIDEBAR_BEGIN + 26)
#define IMG_WIDTH6_ICON (RID_SVX_SIDEBAR_BEGIN + 27)
#define IMG_WIDTH7_ICON (RID_SVX_SIDEBAR_BEGIN + 28)
#define IMG_WIDTH8_ICON (RID_SVX_SIDEBAR_BEGIN + 29)
//color popup page
#define VS_COLOR 1
......
svx/source/sidebar/line/LinePropertyPanel.src
Dosyayı görüntüle @ 35c31f5f
......@@ -25,7 +25,7 @@
#define TOOLBOX_HEIGHT 14
#define LISTBOX_HEIGHT 99
Image IMG_COLOR
Image IMG_LINE_COLOR
{
ImageBitmap = Bitmap{File = "symphony/Line_color.png";};
};
......
svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
Dosyayı görüntüle @ 35c31f5f
......@@ -73,8 +73,8 @@ ParaLineSpacingControl::ParaLineSpacingControl(Window* pParent, svx::sidebar::Pa
, maSelSpacing115 (SVX_RES(IMG_SEL_SPACING115))
, maSelSpacing15 (SVX_RES(IMG_SEL_SPACING15))
, maSelSpacing2 (SVX_RES(IMG_SEL_SPACING2))
, maImgCus (SVX_RES(IMG_CUSTOM))
, maImgCusGrey (SVX_RES(IMG_CUSTOM_GRAY))
, maImgCus (SVX_RES(IMG_PARA_CUSTOM))
, maImgCusGrey (SVX_RES(IMG_PARA_CUSTOM_GRAY))
, maStrCus (SVX_RESSTR(STR_LCVALUE))
, mpImg(NULL)
, mpImgSel(NULL)
......
svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
Dosyayı görüntüle @ 35c31f5f
......@@ -19,21 +19,6 @@
#include "svx/dialogs.hrc"
#define IMG_SPACE3 (RID_SVX_SIDEBAR_BEGIN + 0)
#define IMG_INDENT_HANG (RID_SVX_SIDEBAR_BEGIN + 1)
#define IMG_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 2)
#define IMG_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 3)
#define IMG_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 4)
#define IMG_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 5)
#define IMG_SEL_SPACING1 (RID_SVX_SIDEBAR_BEGIN + 6)
#define IMG_SEL_SPACING115 (RID_SVX_SIDEBAR_BEGIN + 7)
#define IMG_SEL_SPACING15 (RID_SVX_SIDEBAR_BEGIN + 8)
#define IMG_SEL_SPACING2 (RID_SVX_SIDEBAR_BEGIN + 9)
#define IMG_CUSTOM (RID_SVX_SIDEBAR_BEGIN + 10)
#define IMG_CUSTOM_GRAY (RID_SVX_SIDEBAR_BEGIN + 11)
#define IL_NUM_BULLET (RID_SVX_SIDEBAR_BEGIN + 12)
#define IL_NUM_BULLET_RTL (RID_SVX_SIDEBAR_BEGIN + 13)
//for numbering and bullet
#define IID_BULLET 1
#define IID_NUMBER 2
......
svx/source/sidebar/paragraph/ParaPropertyPanel.src
Dosyayı görüntüle @ 35c31f5f
......@@ -203,11 +203,11 @@ Image IMG_SEL_SPACING2
{
ImageBitmap = Bitmap{File = "symphony/lpselected-spacing-2.png";};
};
Image IMG_CUSTOM
Image IMG_PARA_CUSTOM
{
ImageBitmap = Bitmap{File = "symphony/last_custom_common.png";};
};
Image IMG_CUSTOM_GRAY
Image IMG_PARA_CUSTOM_GRAY
{
ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png";};
};
......
svx/source/unodraw/recoveryui.cxx
Dosyayı görüntüle @ 35c31f5f
......@@ -281,11 +281,10 @@ bool RecoveryUI::impl_doEmergencySave()
css::uno::Reference< css::frame::XStatusListener > xCore(pCore);
// create dialog for this operation and bind it to the used core service
Dialog* pDialog = new svxdr::SaveDialog(m_pParentWindow, pCore);
boost::scoped_ptr<Dialog> xDialog(new svxdr::SaveDialog(m_pParentWindow, pCore));
// start the dialog
short nRet = pDialog->Execute();
delete pDialog;
short nRet = xDialog->Execute();
return (nRet==DLG_RET_OK_AUTOLUNCH);
}
......@@ -297,23 +296,16 @@ void RecoveryUI::impl_doRecovery()
// create all needed dialogs for this operation
// and bind it to the used core service
boost::scoped_ptr<svxdr::TabDialog4Recovery> xWizard(new svxdr::TabDialog4Recovery(m_pParentWindow));
svxdr::IExtendedTabPage* pPage1 = new svxdr::RecoveryDialog(xWizard.get(), pCore );
boost::scoped_ptr<Dialog> xDialog(new svxdr::RecoveryDialog(m_pParentWindow, pCore));
xWizard->addTabPage(pPage1);
// start the wizard
xWizard->Execute();
// start the dialog
xDialog->Execute();
impl_showAllRecoveredDocs();
delete pPage1 ;
delete_pending_crash();
}
void RecoveryUI::impl_showAllRecoveredDocs()
{
css::uno::Reference< css::frame::XDesktop2 > xDesktop = css::frame::Desktop::create( m_xContext );
......
svx/uiconfig/ui/docrecoveryrecoverdialog.ui 0 → 100644
Dosyayı görüntüle @ 35c31f5f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment