[Libreoffice-commits] .: Branch 'integration/dev300_m101' - svx/AllLangResTarget_svx.mk svx/inc svx/Library_svx.mk svx/Package_inc.mk svx/source

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Sun Mar 13 04:24:19 PDT 2011


 svx/AllLangResTarget_svx.mk    |    1 
 svx/Library_svx.mk             |    1 
 svx/Package_inc.mk             |    1 
 svx/inc/svx/linkwarn.hxx       |   57 ++++++++++++++++++++++++++++++++++++++
 svx/source/dialog/linkwarn.hrc |   60 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 120 insertions(+)

New commits:
commit acc12e35cd8dd6b53ae604d949ad2dcd517d6d4b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Mar 13 05:34:24 2011 -0500

    re-add linkwarn, used by impress

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 3680c9f..a18852a 100755
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
     svx/source/dialog/imapdlg.src \
     svx/source/dialog/langbox.src \
     svx/source/dialog/language.src \
+    svx/source/dialog/linkwarn.src \
     svx/source/dialog/optgrid.src \
     svx/source/dialog/passwd.src \
     svx/source/dialog/prtqry.src \
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 732526c..cdb00ee 100755
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -118,6 +118,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
     svx/source/dialog/hyperdlg \
     svx/source/dialog/imapdlg \
     svx/source/dialog/imapwnd \
+    svx/source/dialog/linkwarn \
     svx/source/dialog/measctrl \
     svx/source/dialog/optgrid \
     svx/source/dialog/orienthelper \
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 11ad872..d5ffc3c 100755
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftdiit.hxx,svx/xftdiit.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fntctl.hxx,svx/fntctl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svdattr.hxx,svx/svdattr.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/imapdlg.hxx,svx/imapdlg.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/linkwarn.hxx,svx/linkwarn.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/formatpaintbrushctrl.hxx,svx/formatpaintbrushctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xcolit.hxx,svx/xcolit.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/xftmrit.hxx,svx/xftmrit.hxx))
diff --git a/svx/inc/svx/linkwarn.hxx b/svx/inc/svx/linkwarn.hxx
new file mode 100644
index 0000000..4be65cc
--- /dev/null
+++ b/svx/inc/svx/linkwarn.hxx
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2010 Novell, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SFX_LINKWARN_HXX
+#define _SFX_LINKWARN_HXX
+
+#include <vcl/button.hxx>
+#include <vcl/fixed.hxx>
+#include <sfx2/basedlgs.hxx>
+#include "svx/svxdllapi.h"
+
+class SVX_DLLPUBLIC SvxLinkWarningDialog : public SfxModalDialog
+{
+private:
+    FixedImage              m_aQueryImage;
+    FixedText               m_aInfoText;
+    OKButton                m_aLinkGraphicBtn;
+    CancelButton            m_aEmbedGraphicBtn;
+    FixedLine               m_aOptionLine;
+    CheckBox                m_aWarningOnBox;
+
+    void                    InitSize();
+
+public:
+             SvxLinkWarningDialog( Window* pParent, const String& _rFileName );
+    virtual ~SvxLinkWarningDialog();
+};
+
+#endif // #ifndef _SFX_LINKWARN_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/linkwarn.hrc b/svx/source/dialog/linkwarn.hrc
new file mode 100644
index 0000000..d01dc88
--- /dev/null
+++ b/svx/source/dialog/linkwarn.hrc
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ * Copyright 2010 Novell, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef _SVX_LINKWARN_HRC
+#define _SVX_LINKWARN_HRC
+
+#include <svtools/controldims.hrc>
+
+// dialog ids
+#define FI_QUERY        10
+#define FT_INFOTEXT     11
+#define PB_OK          12
+#define PB_NO           13
+#define FL_OPTION       15
+#define CB_WARNING_OFF  16
+
+// --------- general metrics ---------
+
+#define SYMBOL_EDGE         20
+#define DIALOG_WIDTH        220
+#define INFO_TEXT_LINES     11
+
+#define AW_COL_1            (RSC_SP_DLG_INNERBORDER_LEFT)
+#define AW_COL_2            (AW_COL_1+SYMBOL_EDGE+RSC_SP_CTRL_DESC_X)
+#define AW_COL_3            (AW_COL_2+RSC_CD_PUSHBUTTON_WIDTH+RSC_SP_CTRL_DESC_X)
+#define AW_COL_4            (DIALOG_WIDTH-RSC_SP_DLG_INNERBORDER_RIGHT-RSC_CD_PUSHBUTTON_WIDTH)
+
+#define AW_ROW_1            (RSC_SP_DLG_INNERBORDER_TOP)
+#define AW_ROW_2            (AW_ROW_1+INFO_TEXT_LINES*RSC_CD_FIXEDTEXT_HEIGHT+RSC_SP_CTRL_Y)
+#define AW_ROW_3            (AW_ROW_2+RSC_CD_PUSHBUTTON_HEIGHT+RSC_SP_CTRL_DESC_Y)
+#define AW_ROW_4            (AW_ROW_3+RSC_CD_FIXEDLINE_HEIGHT+RSC_SP_CTRL_DESC_Y)
+
+#define DIALOG_HEIGHT       (AW_ROW_4+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_DLG_INNERBORDER_BOTTOM)
+
+#endif


More information about the Libreoffice-commits mailing list