summaryrefslogtreecommitdiff
path: root/svx/source
diff options
context:
space:
mode:
authorpw <pw@openoffice.org>2000-11-22 12:46:00 +0000
committerpw <pw@openoffice.org>2000-11-22 12:46:00 +0000
commit1bc5f191a261ca94002bbd254215677a1fb39bf5 (patch)
treef0857368dc5aea7eeefb5af5637725cc69ffd891 /svx/source
parent82d1acf6eb6f86db362e800cc0c9a154fb1fe1c4 (diff)
hltpbase.cxx
Diffstat (limited to 'svx/source')
-rw-r--r--svx/source/dialog/hltpbase.cxx8
-rw-r--r--svx/source/dialog/hyperdlg.cxx10
-rw-r--r--svx/source/dialog/iconcdlg.cxx10
3 files changed, 16 insertions, 12 deletions
diff --git a/svx/source/dialog/hltpbase.cxx b/svx/source/dialog/hltpbase.cxx
index bb3336fb4f7b..54b6e4887f09 100644
--- a/svx/source/dialog/hltpbase.cxx
+++ b/svx/source/dialog/hltpbase.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hltpbase.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: pw $ $Date: 2000-10-10 12:35:10 $
+ * last change: $Author: pw $ $Date: 2000-11-22 13:46:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -456,7 +456,9 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg )
{
BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos );
- mpMarkWnd->ConnectToDialog( !bDisConnectDlg );
+
+ if( bDisConnectDlg )
+ mpMarkWnd->ConnectToDialog( FALSE );
return ( !bReturn && IsMarkWndVisible() );
}
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index cf1986c22ea7..276471d81f7e 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: hyperdlg.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: pb $ $Date: 2000-11-10 13:28:04 $
+ * last change: $Author: pw $ $Date: 2000-11-22 13:46:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -225,8 +225,8 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
SvxHpLinkDlg::~SvxHpLinkDlg ()
{
// delete config item, so the base class (IconChoiceDialog) can not load it on the next start
- SvtViewOptions aViewOpt( E_TABDIALOG, String::CreateFromInt32( SID_HYPERLINK_DIALOG ) );
- aViewOpt.Delete();
+// SvtViewOptions aViewOpt( E_TABDIALOG, String::CreateFromInt32( SID_HYPERLINK_DIALOG ) );
+// aViewOpt.Delete();
delete mpItemSet;
}
@@ -292,7 +292,7 @@ void SvxHpLinkDlg::Move()
}
if ( bDoInvalid )
- Invalidate();
+ Invalidate(INVALIDATE_BACKGROUND);
}
Window::Move();
diff --git a/svx/source/dialog/iconcdlg.cxx b/svx/source/dialog/iconcdlg.cxx
index 2b63ced6dfad..6a0ba0920822 100644
--- a/svx/source/dialog/iconcdlg.cxx
+++ b/svx/source/dialog/iconcdlg.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: iconcdlg.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: pb $ $Date: 2000-11-10 13:28:04 $
+ * last change: $Author: pw $ $Date: 2000-11-22 13:46:00 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -394,9 +394,11 @@ IconChoiceDialog ::~IconChoiceDialog ()
// save configuration at INI-Manager
// and remove pages
+/*
SvtViewOptions aTabDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
aTabDlgOpt.SetPosition( GetPosPixel().X(), GetPosPixel().Y() );
aTabDlgOpt.SetPageID( mnCurrentPageId );
+*/
const USHORT nCount = maPageList.Count();
for ( i = 0; i < nCount; ++i )
@@ -954,7 +956,7 @@ void IconChoiceDialog::ActivatePageImpl ()
pData->pPage = (pData->fnCreatePage)( this, *CreateInputItemSet( mnCurrentPageId ) );
SvtViewOptions aTabPageOpt( E_TABPAGE, String::CreateFromInt32( pData->nId ) );
- pData->pPage->SetUserData( aTabPageOpt.GetUserData() );
+// pData->pPage->SetUserData( aTabPageOpt.GetUserData() );
SetPosSizePages ( pData->nId );
PageCreated( mnCurrentPageId, *(pData->pPage) );
@@ -1246,7 +1248,7 @@ void IconChoiceDialog::Start_Impl()
// Konfiguration vorhanden?
SvtViewOptions aTabDlgOpt( E_TABDIALOG, String::CreateFromInt32( nResId ) );
- if ( aTabDlgOpt.Exists() )
+ if ( 0 )//aTabDlgOpt.Exists() )
{
// ggf. Position aus Konfig
aTabDlgOpt.GetPosition( aPos.X(), aPos.Y() );