summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-03-17 15:21:30 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-03-17 15:21:30 +0200
commit17ec4acbb0f70732209ce35c5fa7f04e7369efd2 (patch)
tree7da0715d476c24ab236bf06a229cc2cf435a3964
parent992c6c361cad202467c392752de22d699a9897dc (diff)
No #warning in MSVC
-rwxr-xr-xsfx2/source/dialog/passwd.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 6d6c97037a..45ba22ebea 100755
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -249,7 +249,9 @@ 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
Size a3Size = LogicToPixel( Size( 3, 3 ), MAP_APPFONT );
Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT );
long nMinHeight = maHelpBtn.GetPosPixel().Y() +