summaryrefslogtreecommitdiff
path: root/sw/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r--sw/source/ui/inc/colex.hxx3
-rw-r--r--sw/source/ui/inc/column.hxx1
-rw-r--r--sw/source/ui/inc/convert.hxx4
-rw-r--r--sw/source/ui/inc/hidfunc.h1
-rw-r--r--sw/source/ui/inc/itemdef.hxx40
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx1
-rw-r--r--sw/source/ui/inc/table.hrc2
-rw-r--r--sw/source/ui/inc/uivwimp.hxx2
-rw-r--r--sw/source/ui/inc/wrtsh.hxx1
9 files changed, 10 insertions, 45 deletions
diff --git a/sw/source/ui/inc/colex.hxx b/sw/source/ui/inc/colex.hxx
index 9d9e61904c78..eca121c4e556 100644
--- a/sw/source/ui/inc/colex.hxx
+++ b/sw/source/ui/inc/colex.hxx
@@ -31,6 +31,7 @@
#define _COLEX_HXX
#include <svx/pagectrl.hxx>
+#include <svx/paperinf.hxx>
#include "swdllapi.h"
#include <fmtclds.hxx>
#include "frmatr.hxx"
@@ -46,7 +47,7 @@ class SW_DLLPUBLIC SwPageExample : public SvxPageWindow
public:
SwPageExample(Window* pPar, const ResId& rResId ) :
SvxPageWindow(pPar, rResId )
- {SetSize(Size(11907, 16433));/*DIN A4*/}
+ {SetSize(SvxPaperInfo::GetPaperSize(PAPER_A4));/*DIN A4*/}
void UpdateExample( const SfxItemSet& rSet );
};
diff --git a/sw/source/ui/inc/column.hxx b/sw/source/ui/inc/column.hxx
index 491a603d52ab..a8e6597cf757 100644
--- a/sw/source/ui/inc/column.hxx
+++ b/sw/source/ui/inc/column.hxx
@@ -223,6 +223,7 @@ public:
void ShowBalance(BOOL bShow) {aBalanceColsCB.Show(bShow);}
void SetInSection(BOOL bSet);
+ void ActivateColumnControl() {aCLNrEdt.GrabFocus();}
};
#endif
diff --git a/sw/source/ui/inc/convert.hxx b/sw/source/ui/inc/convert.hxx
index bce24ac08018..6e550b4c9607 100644
--- a/sw/source/ui/inc/convert.hxx
+++ b/sw/source/ui/inc/convert.hxx
@@ -63,14 +63,14 @@ class SwConvertTableDlg: public SfxModalDialog
FixedText aRepeatHeaderAfterFT;
TextControlCombo aRepeatHeaderCombo;
+ FixedLine aOptionsFL;
CheckBox aDontSplitCB;
CheckBox aBorderCB;
- FixedLine aOptionsFL;
+ PushButton aAutoFmtBtn;
OKButton aOkBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
- PushButton aAutoFmtBtn;
String sConvertTextTable;
SwTableAutoFmt* pTAutoFmt;
diff --git a/sw/source/ui/inc/hidfunc.h b/sw/source/ui/inc/hidfunc.h
index a85d5181031a..b2b961a882d4 100644
--- a/sw/source/ui/inc/hidfunc.h
+++ b/sw/source/ui/inc/hidfunc.h
@@ -209,6 +209,7 @@
#define HID_SET_STANDARD_FONTS 1442
#define HID_COPY 1102
#define HID_PASTE 1113
+#define HID_PASTEUNFORMATTED 1115
#define HID_PASTESPECIAL 1114
#define HID_CUT 1103
#define HID_FLIP_HORZ_GRAFIC 1425
diff --git a/sw/source/ui/inc/itemdef.hxx b/sw/source/ui/inc/itemdef.hxx
deleted file mode 100644
index c73a429e0fee..000000000000
--- a/sw/source/ui/inc/itemdef.hxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: itemdef.hxx,v $
- * $Revision: 1.3 $
- *
- * 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 ITEMDEF_HXX
-#define ITEMDEF_HXX
-
-
-#include <sfx2/msg.hxx>
-
-SFX_DECL_TYPE(10); //SwElemItem
-SFX_DECL_TYPE(13); //SwAddPrinterItem
-SFX_DECL_TYPE(16); //SwDocDisplayItem
-
-#endif
diff --git a/sw/source/ui/inc/swdtflvr.hxx b/sw/source/ui/inc/swdtflvr.hxx
index 5cd5a2a319e1..d2a5a2ed4d2b 100644
--- a/sw/source/ui/inc/swdtflvr.hxx
+++ b/sw/source/ui/inc/swdtflvr.hxx
@@ -193,6 +193,7 @@ public:
static BOOL IsPasteSpecial( const SwWrtShell& rWrtShell,
const TransferableDataHelper& );
+ static int PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& );
static int PasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, ULONG& rFormatUsed );
static int PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData,
ULONG nFormat );
diff --git a/sw/source/ui/inc/table.hrc b/sw/source/ui/inc/table.hrc
index 77ac72c12c33..0903a95453ad 100644
--- a/sw/source/ui/inc/table.hrc
+++ b/sw/source/ui/inc/table.hrc
@@ -33,7 +33,7 @@
#define DLG_INSERT_TABLE RC_TABLE_BEGIN
#define DLG_FORMAT_TABLE (RC_TABLE_BEGIN + 1)
#define DLG_CONV_TEXT_TABLE (RC_TABLE_BEGIN + 2)
-#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3)
+//#define DLG_INS_ROW_COL (RC_TABLE_BEGIN + 3) moved to svx
#define DLG_ROW_HEIGHT (RC_TABLE_BEGIN + 4)
#define DLG_SPLIT (RC_TABLE_BEGIN + 5)
#define DLG_COL_WIDTH (RC_TABLE_BEGIN + 6)
diff --git a/sw/source/ui/inc/uivwimp.hxx b/sw/source/ui/inc/uivwimp.hxx
index 65b8d0b9b95b..d23da67e4209 100644
--- a/sw/source/ui/inc/uivwimp.hxx
+++ b/sw/source/ui/inc/uivwimp.hxx
@@ -153,7 +153,7 @@ public:
SfxObjectShellRef & GetTmpSelectionDoc() { return xTmpSelDocSh; }
- SfxObjectShellRef& GetEmbeddedObjRef() { return (SfxObjectShellRef&)(long&)aEmbeddedObjRef; }
+ SfxObjectShellRef& GetEmbeddedObjRef() { return *boost::addressof(aEmbeddedObjRef); }
void AddTransferable(SwTransferable& rTransferable);
diff --git a/sw/source/ui/inc/wrtsh.hxx b/sw/source/ui/inc/wrtsh.hxx
index 70e509972ddb..5656f6df1ab4 100644
--- a/sw/source/ui/inc/wrtsh.hxx
+++ b/sw/source/ui/inc/wrtsh.hxx
@@ -157,6 +157,7 @@ public:
void SetInsMode( BOOL bOn = TRUE );
void ToggleInsMode() { SetInsMode( !bIns ); }
BOOL IsInsMode() const { return bIns; }
+ void SetRedlineModeAndCheckInsMode( USHORT eMode );
void EnterSelFrmMode(const Point *pStartDrag = 0);
void LeaveSelFrmMode();
generated by cgit (git 2.34.1) at 2025-05-17 04:54:09 +0000