diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:35:18 +0100 |
| commit | 6a75a47be7b3aafbb655ffa70609fd2ed7ca4b3e (patch) | |
| tree | d00d2024213e09b8eba4704b8b6660eb42c3921c /automation/source/miniapp/servres.cxx | |
| parent | 7fb1e1ea8c9f8d3ef13524d1327272824df7110d (diff) | |
| parent | eee3dbc7af039669d447d2e55abd896ea3383df1 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
automation/source/communi/communi.cxx
automation/source/server/recorder.cxx
automation/source/server/server.cxx
basctl/source/basicide/basobj2.cxx
Diffstat (limited to 'automation/source/miniapp/servres.cxx')
| -rw-r--r-- | automation/source/miniapp/servres.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automation/source/miniapp/servres.cxx b/automation/source/miniapp/servres.cxx index 3cbb4bf3c80c..1bd795fd4041 100644 --- a/automation/source/miniapp/servres.cxx +++ b/automation/source/miniapp/servres.cxx @@ -35,7 +35,7 @@ #include "servres.hxx" -ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, BOOL bFreeRes ) +ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, const ResId & rResId, sal_Bool bFreeRes ) : ModalDialog( pParent, rResId ), aCheckBox1( this, ResId( 1, *rResId.GetResMgr() ) ), aTriStateBox1( this, ResId( 1, *rResId.GetResMgr() ) ), @@ -53,7 +53,7 @@ ModalDialogGROSSER_TEST_DLG::ModalDialogGROSSER_TEST_DLG( Window * pParent, cons if( bFreeRes ) FreeResource(); } -MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, BOOL ) +MenuMENU_CLIENT::MenuMENU_CLIENT( const ResId & rResId, sal_Bool ) : MenuBar( rResId ) { // No subresources, automatic free resource |