summaryrefslogtreecommitdiff
path: root/sw/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/inc')
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx5
-rw-r--r--sw/inc/cmdid.h5
-rw-r--r--sw/inc/doc.hxx2
-rw-r--r--sw/inc/fesh.hxx13
-rw-r--r--sw/inc/frmfmt.hxx10
-rw-r--r--sw/inc/makefile.mk49
-rw-r--r--sw/inc/ndole.hxx3
-rw-r--r--sw/inc/pch/precompiled_sw.hxx4
-rw-r--r--sw/inc/ring.hxx3
-rw-r--r--sw/inc/swabstdlg.hxx2
-rw-r--r--sw/inc/swcli.hxx2
-rw-r--r--sw/inc/unoframe.hxx2
12 files changed, 41 insertions, 59 deletions
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 6be53158ddc8..25b1c57f9a0b 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -89,7 +89,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
GLOBAL_DOCUMENT_SAVE_LINKS,
LABEL_DOCUMENT,
PURGE_OLE,
- KERN_ASIAN_PUNCTUATION
+ KERN_ASIAN_PUNCTUATION,
+ MATH_BASELINE_ALIGNMENT
};
public:
@@ -209,4 +210,4 @@ protected:
virtual ~IDocumentSettingAccess() {};
};
- #endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
+#endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index a206392aad3b..ac4222ab1ce9 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -908,6 +908,9 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_UNO_META (FN_EXTRA2 + 112)
#define FN_UNO_NESTED_TEXT_CONTENT (FN_EXTRA2 + 113)
+// #i972: bool items to be passed to SwFrmPage for evaluation
+#define FN_OLE_IS_MATH (FN_EXTRA2 + 114)
+#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115)
/*--------------------------------------------------------------------
Bereich: Hilfe
--------------------------------------------------------------------*/
@@ -1058,7 +1061,7 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
#define FN_ENVELOP (FN_ENVELP )
-#define FN_DELETE_NOTE (FN_NOTES+0)
+
#define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1)
#define FN_DELETE_ALL_NOTES (FN_NOTES+2)
#define FN_HIDE_NOTE (FN_NOTES+3)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 1e26b0f0e2bd..736fbb70a3b5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -588,6 +588,7 @@ private:
bool mbUseFormerTextWrapping : 1; // FME 2005-05-11 #108724#
bool mbConsiderWrapOnObjPos : 1; // OD 2004-05-05 #i28701#
// TRUE: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
+ bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972#
// non-ui-compatibility flags:
bool mbOldNumbering : 1; // HBRINKM #111955#
@@ -1902,6 +1903,7 @@ public:
// loesche den nicht sichtbaren ::com::sun::star::ucb::Content aus dem Document, wie z.B.:
// versteckte Bereiche, versteckte Absaetze
sal_Bool RemoveInvisibleContent();
+ sal_Bool HasInvisibleContent() const;
//restore the invisible content if it's available on the undo stack
sal_Bool RestoreInvisibleContent();
// replace fields by text - mailmerge support
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 216f902e4b6c..873b28225204 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -29,6 +29,7 @@
#include <com/sun/star/text/RelOrientation.hpp>
#include <com/sun/star/embed/XClassifiedObject.hpp>
+#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <svx/svdobj.hxx>
#include "swdllapi.h"
@@ -435,6 +436,9 @@ public:
void SetFlyName( const String& rName );
const String& GetFlyName() const;
+ // get reference to OLE object (if there is one) for selected FlyFrame
+ const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef() const;
+
// erezeuge eindeutige Namen fuer Rahmen
String GetUniqueGrfName() const;
String GetUniqueOLEName() const;
@@ -550,6 +554,15 @@ public:
BOOL ReplaceSdrObj( const String& rGrfName, const String& rFltName,
const Graphic* pGrf = 0 );
+ // --> #i972#
+ // for starmath formulas anchored 'as char' it alignes it baseline to baseline
+ // changing the previous vertical orientation
+ void AlignFormulaToBaseline( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 );
+
+ // aligns all formulas with anchor 'as char' to baseline
+ void AlignAllFormulasToBaseline();
+ // <--
+
//------------------------------------------
//Auskunft ueber naechstliegenden Inhalt zum uebergebenen Point
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 388607d4f0e0..4829775cf0fb 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -32,6 +32,7 @@
// <--
#include <cppuhelper/weakref.hxx>
+#include <tools/gen.hxx>
#include <format.hxx>
@@ -153,6 +154,12 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
{
friend class SwDoc;
+ // #i972:
+ // it stores the previous position of Prt rectangle from RequestObjectResize
+ // so it can be used to move frames of non-resizable objects to align them correctly
+ // when they get borders (this is done in SwWrtShell::CalcAndGetScale)
+ Point m_aLastFlyFrmPrtRectPos;
+
//Beide nicht vorhanden.
SwFlyFrmFmt( const SwFlyFrmFmt &rCpy );
SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy );
@@ -219,6 +226,9 @@ public:
*/
sal_Bool IsBackgroundBrushInherited() const;
+ const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; }
+ void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
+
DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt)
};
diff --git a/sw/inc/makefile.mk b/sw/inc/makefile.mk
deleted file mode 100644
index b5efd14c8164..000000000000
--- a/sw/inc/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# 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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=sw
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
-.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" )
-ALLTAR : \
- $(SLO)$/precompiled.pch \
- $(SLO)$/precompiled_ex.pch
-
-.ENDIF # "$(ENABLE_PCH)"!=""
-
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 631dd88f78c5..e439109ff866 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -67,7 +67,7 @@ public:
String GetDescription();
#ifndef _FESHVIEW_ONLY_INLINE_NEEDED
- com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef();
+ const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef();
svt::EmbeddedObjectRef& GetObject();
const String& GetCurrentPersistName() const { return aName; }
BOOL IsOleRef() const; //Damit das Objekt nicht unnoetig geladen werden muss.
@@ -168,4 +168,3 @@ inline const SwOLENode *SwNode::GetOLENode() const
}
#endif // _NDOLE_HXX
-
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 39eb365b549c..7a5f1e2847b1 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -748,7 +748,7 @@
#include "svx/globlmn.hrc"
#include "svx/grafctrl.hxx"
#include "editeng/hangulhanja.hxx"
-#include "svx/hdft2.hxx"
+#include "svx/hdft.hxx"
#include "svtools/htmlcfg.hxx"
#include "svx/htmlmode.hxx"
#include "svx/hyperdlg.hxx"
@@ -920,7 +920,7 @@
#include "vcl/group.hxx"
#include "vcl/help.hxx"
#include "vcl/image.hxx"
-#include "vcl/imagebtn.hxx"
+#include "vcl/button.hxx"
#include "vcl/inputctx.hxx"
#include "vcl/jobset.hxx"
#include "vcl/keycod.hxx"
diff --git a/sw/inc/ring.hxx b/sw/inc/ring.hxx
index 9bb171f7c256..db9fe273a229 100644
--- a/sw/inc/ring.hxx
+++ b/sw/inc/ring.hxx
@@ -27,9 +27,10 @@
#ifndef _RING_HXX
#define _RING_HXX
+#include <swdllapi.h>
#include <swtypes.hxx>
-class Ring
+class SW_DLLPUBLIC Ring
{
Ring *pNext;
Ring* pPrev; // zur Optimierung, damit das ein/ausketten schneller geht!
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d2b4c1f5c1a1..351d3bdf76f4 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -494,5 +494,5 @@ public:
virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0;
virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0;
};
-#endif
+#endif
diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx
index 518d7885422c..113a63cc6d7c 100644
--- a/sw/inc/swcli.hxx
+++ b/sw/inc/swcli.hxx
@@ -53,6 +53,8 @@ public:
void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; }
BOOL IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; }
+
+ virtual void FormatChanged();
};
#endif
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 65de34a4db7f..9323d209c19a 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -161,7 +161,7 @@ public:
void ResetDescriptor();
//copy text from a given source PaM
void SetSelection(SwPaM& rCopySource);
- static SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
+ static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject( SwFlyFrmFmt *pFmt );
};
/*-----------------20.02.98 11:28-------------------
generated by cgit (git 2.34.1) at 2025-02-25 08:33:51 +0000