#78749# set help id for name warning msg boxes

10 files changed, 83 insertions, 43 deletions

diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc
index 68adef855c9d..5f1ba281b3ad 100644
--- a/svx/inc/helpid.hrc
+++ b/svx/inc/helpid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: helpid.hrc,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: cl $ $Date: 2001-02-13 16:08:50 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 16:55:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -484,7 +484,8 @@
 #define HID_OPTIONS_ASIAN_LAYOUT                (HID_SVX_START + 395)
 #define HID_SVXTBX_FORM                         (HID_SVX_START + 396)
 
-#define HID_POPUP_COLOR_CTRL                    (HID_SVX_START + 397)
+#define HID_WARN_NAME_DUPLICATE                 (HID_SVX_START + 397)
+#define HID_POPUP_COLOR_CTRL                    (HID_SVX_START + 398)
 
 // -----------------------------------------------------------------------
 // "Uberlaufpr"ufung -----------------------------------------------------
diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/dialog/hltpbase.cxx
index da927356a31f..c996cccc7ed1 100644
--- a/svx/source/dialog/hltpbase.cxx
+++ b/svx/source/dialog/hltpbase.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hltpbase.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: pw $ $Date: 2000-11-22 13:54:27 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -489,19 +489,19 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
         if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 )
         {
             // Pos Extrawindow anywhere
-            MoveToExtraWnd( Point( 1, 1.1*aDlgPos.Y() ) );
+            MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ) );
             mpMarkWnd->ConnectToDialog( FALSE );
         }
         else
         {
             // Pos Extrawindow on the left side of Dialog
-            MoveToExtraWnd( aDlgPos - Point( 0.02*aDlgSize.Width(), 0 ) - Point( aExtraWndSize.Width(), 0 ) );
+            MoveToExtraWnd( aDlgPos - Point( long(0.02*aDlgSize.Width()), 0 ) - Point( aExtraWndSize.Width(), 0 ) );
         }
     }
     else
     {
         // Pos Extrawindow on the right side of Dialog
-        MoveToExtraWnd ( aDlgPos + Point( 1.02*aDlgSize.getWidth(), 0 ) );
+        MoveToExtraWnd ( aDlgPos + Point( long(1.02*aDlgSize.getWidth()), 0 ) );
     }
 
     // Set size of Extra-Window
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index 194ce88808f0..989d6032e4fb 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hyperdlg.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: pw $ $Date: 2000-11-22 13:56:12 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,11 +144,11 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( Window* pParent, USHORT nId,
         Size aDlgSize ( GetSizePixel () );
 
         if( aParentSize.Width() < pInfo->aPos.X() )
-            pInfo->aPos.setX( aParentSize.Width()-aDlgSize.Width() < 0.1*aParentSize.Width() ?
-                              0.1*aParentSize.Width() : aParentSize.Width()-aDlgSize.Width() );
+            pInfo->aPos.setX( aParentSize.Width()-aDlgSize.Width() < long(0.1*aParentSize.Width()) ?
+                              long(0.1*aParentSize.Width()) : aParentSize.Width()-aDlgSize.Width() );
         if( aParentSize.Height() < pInfo->aPos. Y() )
-            pInfo->aPos.setY( aParentSize.Height()-aDlgSize.Height() < 0.1*aParentSize.Height() ?
-                              0.1*aParentSize.Height() : aParentSize.Height()-aDlgSize.Height() );
+            pInfo->aPos.setY( aParentSize.Height()-aDlgSize.Height() < long(0.1*aParentSize.Height()) ?
+                              long(0.1*aParentSize.Height()) : aParentSize.Height()-aDlgSize.Height() );
 
         pWindow->SetPosPixel( pInfo->aPos );
     }
@@ -275,20 +275,20 @@ void SvxHpLinkDlg::Move()
             if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 )
             {
                 // Pos Extrawindow anywhere
-                bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, 1.1*aDlgPos.Y() ), TRUE );
+                bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), TRUE );
             }
             else
             {
                 // Pos Extrawindow on the left side of Dialog
                 bDoInvalid = pCurrentPage->MoveToExtraWnd( aDlgPos -
-                                                           Point( 0.02*aDlgSize.Width(), 0 ) -
+                                                           Point( long(0.02*aDlgSize.Width()), 0 ) -
                                                            Point( aExtraWndSize.Width(), 0 ) );
             }
         }
         else
         {
             // Pos Extrawindow on the right side of Dialog
-            bDoInvalid = pCurrentPage->MoveToExtraWnd ( aDlgPos + Point( 1.02*aDlgSize.Width(), 0 ) );
+            bDoInvalid = pCurrentPage->MoveToExtraWnd ( aDlgPos + Point( long(1.02*aDlgSize.Width()), 0 ) );
         }
 
         if ( bDoInvalid )
diff --git a/svx/source/dialog/tpbitmap.cxx b/svx/source/dialog/tpbitmap.cxx
index b71e2b67a32a..daf655a9b42d 100644
--- a/svx/source/dialog/tpbitmap.cxx
+++ b/svx/source/dialog/tpbitmap.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpbitmap.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:00 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -102,6 +102,7 @@
 
 #include "dialogs.hrc"
 
+#include "helpid.hrc"
 #include "xattr.hxx"
 #include "xpool.hxx"
 #include "xtable.hxx"
@@ -581,9 +582,12 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         }
 
         if( !pWarnBox )
+        {
             pWarnBox = new WarningBox( DLGWIN,
                                        WinBits( WB_OK_CANCEL ),
                                        String( ResId( nError, pMgr ) ) );
+            pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE );
+        }
 
         if( pWarnBox->Execute() != RET_OK )
             break;
@@ -697,9 +701,13 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG )
                 }
 
                 if( !pWarnBox )
+                {
                     pWarnBox = new WarningBox( DLGWIN,
                                                WinBits( WB_OK_CANCEL ),
                                                String( ResId( nError, pMgr ) ) );
+                    pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE );
+                }
+
 
                 if( pWarnBox->Execute() != RET_OK )
                     break;
@@ -798,8 +806,11 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
                 bBmpChanged = FALSE;
             }
             else
-                WarningBox( DLGWIN, WinBits( WB_OK ),
-                    String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+            {
+                WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+                aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+                aBox.Execute();
+            }
         }
         delete pDlg;
     }
diff --git a/svx/source/dialog/tpcolor.cxx b/svx/source/dialog/tpcolor.cxx
index d48ab274b942..c6d8264660d3 100644
--- a/svx/source/dialog/tpcolor.cxx
+++ b/svx/source/dialog/tpcolor.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpcolor.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:00 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -510,6 +510,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
     {
         WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ),
             String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+        aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
         aWarningBox.Execute();
 
         SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
@@ -592,6 +593,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
         {
             WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ),
                 String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+            aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
             aWarningBox.Execute();
 
             SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
diff --git a/svx/source/dialog/tpgradnt.cxx b/svx/source/dialog/tpgradnt.cxx
index 920f990ea5d4..517a38a3f0e1 100644
--- a/svx/source/dialog/tpgradnt.cxx
+++ b/svx/source/dialog/tpgradnt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tpgradnt.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:00 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,6 +90,7 @@
 #define ITEMID_GRADIENT_LIST    SID_GRADIENT_LIST
 
 #include "dialogs.hrc"
+#include "helpid.hrc"
 
 #include "xattr.hxx"
 #include "xtable.hxx"
@@ -522,9 +523,12 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         }
 
         if( !pWarnBox )
+        {
             pWarnBox = new WarningBox( DLGWIN,
                                        WinBits( WB_OK_CANCEL ),
                                        String( ResId( nError, pMgr ) ) );
+            pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE );
+        }
 
         if( pWarnBox->Execute() != RET_OK )
             break;
@@ -635,8 +639,12 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
                 *pnGradientListState |= CT_MODIFIED;
             }
             else
-                WarningBox( DLGWIN, WinBits( WB_OK ),
-                    String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+            {
+                WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+                aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+                aBox.Execute();
+            }
+
         }
         delete pDlg;
     }
diff --git a/svx/source/dialog/tphatch.cxx b/svx/source/dialog/tphatch.cxx
index 25d830c76e45..395c2ea7b857 100644
--- a/svx/source/dialog/tphatch.cxx
+++ b/svx/source/dialog/tphatch.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tphatch.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:00 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,7 @@
 #include "dialogs.hrc"
 #include "tabarea.hrc"
 #include "dlgname.hrc"
+#include "helpid.hrc"
 
 #define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
 #define ITEMID_HATCH_LIST       SID_HATCH_LIST
@@ -585,9 +586,12 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
         }
 
         if( !pWarnBox )
+        {
             pWarnBox = new WarningBox( DLGWIN,
                                        WinBits( WB_OK_CANCEL ),
                                        String( ResId( nError, pMgr ) ) );
+            pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE );
+        }
 
         if( pWarnBox->Execute() != RET_OK )
             break;
@@ -695,8 +699,9 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
             }
             else
             {
-                WarningBox( DLGWIN, WinBits( WB_OK ),
-                    String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+                WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+                aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+                aBox.Execute();
             }
         }
         delete( pDlg );
diff --git a/svx/source/dialog/tplnedef.cxx b/svx/source/dialog/tplnedef.cxx
index 4817d26fd6ff..1d945e0652f1 100644
--- a/svx/source/dialog/tplnedef.cxx
+++ b/svx/source/dialog/tplnedef.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tplnedef.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:55 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,7 @@
 #include "dialogs.hrc"
 #include "tabline.hrc"
 #include "dlgname.hrc"
+#include "helpid.hrc"
 
 #define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
 #define ITEMID_DASH_LIST        SID_DASH_LIST
@@ -670,8 +671,11 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
             aMtrDistance.SaveValue();
         }
         else
-            WarningBox( DLGWIN, WinBits( WB_OK ),
-                String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+        {
+            WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+            aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+            aBox.Execute();
+        }
     }
     delete( pDlg );
 
@@ -745,8 +749,11 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
                 aMtrDistance.SaveValue();
             }
             else
-                WarningBox( DLGWIN, WinBits( WB_OK ),
-                    String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+            {
+                WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+                aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+                aBox.Execute();
+            }
         }
         delete( pDlg );
     }
diff --git a/svx/source/dialog/tplneend.cxx b/svx/source/dialog/tplneend.cxx
index b2823809ea9c..1a27e2c95d2b 100644
--- a/svx/source/dialog/tplneend.cxx
+++ b/svx/source/dialog/tplneend.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tplneend.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ka $ $Date: 2000-11-10 14:54:54 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 17:03:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,7 @@
 #include "dialogs.hrc"
 #include "dlgname.hrc"
 #include "tabline.hrc"
+#include "helpid.hrc"
 
 #define ITEMID_COLOR_TABLE      SID_COLOR_TABLE
 #define ITEMID_LINEEND_LIST     SID_LINEEND_LIST
@@ -387,6 +388,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG )
         {
             WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ),
                 String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+            aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
             aWarningBox.Execute();
 
             SvxNameDialog* pDlg = new SvxNameDialog( DLGWIN, aName, aDesc );
@@ -530,8 +532,11 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
                 SelectLineEndHdl_Impl( this );
             }
             else
-                WarningBox( DLGWIN, WinBits( WB_OK ),
-                    String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) ).Execute();
+            {
+                WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, pMgr ) ) );
+                aBox.SetHelpId( HID_WARN_NAME_DUPLICATE );
+                aBox.Execute();
+            }
         }
         delete pDlg;
     }
diff --git a/svx/util/hidother.src b/svx/util/hidother.src
index a2bb07097186..b884941f56ab 100644
--- a/svx/util/hidother.src
+++ b/svx/util/hidother.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: hidother.src,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: cl $ $Date: 2001-02-13 16:07:11 $
+ *  last change: $Author: cl $ $Date: 2001-02-13 16:58:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -367,6 +367,7 @@ hidspecial SID_DSBROWSER_EXPLORER               { HelpID =  SID_DSBROWSER_EXPLOR
 
 hidspecial UID_FORMPROPBROWSER_FRAME            { HelpID =  UID_FORMPROPBROWSER_FRAME       ;};
 
+hidspecial HID_WARN_NAME_DUPLICATE              { HelpID = HID_WARN_NAME_DUPLICATE ;};
 //HID_AUTOCORR_HELP_END