diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:39 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 17:13:39 +0100 |
| commit | ba26ed19d82638f3bda7039edaa37addf274e95f (patch) | |
| tree | acf97d3857a66ee0f4a2e1e8d13010f770e7a913 /sfx2 | |
| parent | Merge commit 'ooo/DEV300_m103' (diff) | |
| parent | Really disable use of pagein on Mac (diff) | |
| download | core-ba26ed19d82638f3bda7039edaa37addf274e95f.tar.gz core-ba26ed19d82638f3bda7039edaa37addf274e95f.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/libs-core
Diffstat (limited to 'sfx2')
| -rwxr-xr-x | sfx2/source/control/objface.cxx | 2 | ||||
| -rwxr-xr-x | sfx2/source/dialog/passwd.cxx | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index f942b17e4dc0..e69c11fa2377 100755 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -428,7 +428,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, aResId.SetResMgr(rResId.GetResMgr()); if( ! aResId.GetResMgr() ) aResId.SetResMgr( SfxApplication::GetOrCreate()->GetOffResManager_Impl() ); - if ( !aResId.GetResMgr()->IsAvailable(aResId) ) + if ( !aResId.GetResMgr() || !aResId.GetResMgr()->IsAvailable(aResId) ) pUI->pName = new String (DEFINE_CONST_UNICODE("NoName")); else pUI->pName = new String(aResId); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 1f029db73d9f..c5e41227896a 100755 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -249,9 +249,7 @@ short SfxPasswordDialog::Execute() maPasswordFT.Show(); if( (mnExtras & SHOWEXTRAS_USER ) ) { -#ifndef _MSC_VER -#warning Inevitably this layout logic will be wrong post merge until we can see the dialog to test it. -#endif + //TODO: Inevitably this layout logic will be wrong post merge until we can see the dialog to test it. Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT ); Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); long nMinHeight = maHelpBtn.GetPosPixel().Y() + |