summaryrefslogtreecommitdiff
path: root/basic/source/app/dialogs.cxx
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2004-07-06 12:23:45 +0000
committerOliver Bolte <obo@openoffice.org>2004-07-06 12:23:45 +0000
commitfd9bf4d4ca72452e04307723797d9c9081a10a42 (patch)
treef537b47403b08964eac2250c0fd270e4b23654fb /basic/source/app/dialogs.cxx
parente44dc769954c7b84f4fea667a8fac3413e1283d2 (diff)
INTEGRATION: CWS docking1 (1.17.34); FILE MERGED
2004/06/15 14:59:10 gh 1.17.34.1: #i29531#add support for string ids to acces UI elements. Needed for new ToolBoxes
Diffstat (limited to 'basic/source/app/dialogs.cxx')
-rw-r--r--basic/source/app/dialogs.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/basic/source/app/dialogs.cxx b/basic/source/app/dialogs.cxx
index abc3b6d960c3..30639ae105c8 100644
--- a/basic/source/app/dialogs.cxx
+++ b/basic/source/app/dialogs.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: dialogs.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: hjs $ $Date: 2004-06-25 16:28:52 $
+ * last change: $Author: obo $ $Date: 2004-07-06 13:23:45 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -1001,8 +1001,10 @@ void DisplayHidDlg::AddData( WinInfoRec* pWinInfo )
aMlbControls.Clear();
aMlbSlots.Clear();
- if ( pWinInfo->aUId.GetULONG() & DH_MODE_DATA_VALID ) // kein altes Office
- nDisplayMode = pWinInfo->aUId.GetULONG(); // Wird im Reset zur bermittlung des Modus verwendet
+ if ( pWinInfo->nRType & DH_MODE_DATA_VALID ) // kein altes Office
+ nDisplayMode = pWinInfo->nRType; // Wird im Reset zur bermittlung des Modus verwendet
+// if ( pWinInfo->aUId.GetULONG() & DH_MODE_DATA_VALID ) // kein altes Office
+// nDisplayMode = pWinInfo->aUId.GetULONG(); // Wird im Reset zur bermittlung des Modus verwendet
return;
}
@@ -1015,7 +1017,7 @@ void DisplayHidDlg::AddData( WinInfoRec* pWinInfo )
else
{
aMsg.AppendAscii( "--" );
- aMsg += pWinInfo->aUId.GetString();
+ aMsg += pWinInfo->aUId;
aMsg.AppendAscii( ": " );
aMsg += pWinInfo->aRName;
}
@@ -1023,7 +1025,7 @@ void DisplayHidDlg::AddData( WinInfoRec* pWinInfo )
}
else
{
- aMsg += pWinInfo->aUId.GetString();
+ aMsg += pWinInfo->aUId;
aMsg.Expand(13);
}
aMsg.AppendAscii( " " ); // Mindestens 3 Blanks sollten schon sein.