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 | 498887fd01f7793842430464508f39352b76d452 (patch) | |
| tree | bba7cdbd7bf36d78a9100ae219b042836805e32a /sfx2 | |
| parent | d4e88719d67c5cadb55c85cd372d412fd969c613 (diff) | |
| parent | a16869e2ff8a85e877f4060995937835f03a2beb (diff) | |
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 4e52eab755..b399e19961 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 ca5f02fa5c..67b3d7b041 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() + |