lili/opennurbs
1
0
Fork 0
mirror of https://github.com/mcneel/opennurbs.git synced 2026-03-18 07:26:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sync changes from upstream repository

Browse Source 
Co-authored-by: Alain <alain@mcneel.com>
Co-authored-by: Andrew Le Bihan <andy@mcneel.com>
Co-authored-by: chuck <chuck@mcneel.com>
Co-authored-by: croudyj <croudyj@gmail.com>
Co-authored-by: Dale Fugier <dale@mcneel.com>
Co-authored-by: Giulio Piacentino <giulio@mcneel.com>
Co-authored-by: Greg Arden <greg@mcneel.com>
Co-authored-by: Jussi Aaltonen <jussi@mcneel.com>
Co-authored-by: kike-garbo <kike@mcneel.com>
Co-authored-by: Steve Baer <steve@mcneel.com>
This commit is contained in:
Bozo The Builder
2022-11-21 14:18:57 -08:00
parent e37a90a8a9
commit e7c29061e3
325 changed files with 3592 additions and 2749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
opennurbs_textiterator.cpp
View File

@@ -1,6 +1,5 @@
/*
//
// Copyright (c) 1993-2018 Robert McNeel & Associates. All rights reserved.
// Copyright (c) 1993-2022 Robert McNeel & Associates. All rights reserved.
// OpenNURBS, Rhinoceros, and Rhino3D are registered trademarks of Robert
// McNeel & Associates.
//
@@ -11,7 +10,6 @@
// For complete openNURBS copyright information see <http://www.opennurbs.org>.
//
////////////////////////////////////////////////////////////////
*/
#include "opennurbs.h"
@@ -3316,7 +3314,6 @@ bool RtfComposer::Compose(
{
// RH-64720 - Only do this if the stack isn't from a field
run_strings += L"[[";
run_strings += run->m_stacked_text->m_separator;
GetRunText(run->m_stacked_text->m_top_run, run_strings, make_rtf);
run_strings += run->m_stacked_text->m_separator;
GetRunText(run->m_stacked_text->m_bottom_run, run_strings, make_rtf);
@@ -3597,7 +3594,6 @@ const ON_wString RtfComposer::ComposeAppleRTF(
if (run->IsStacked() == ON_TextRun::Stacked::kStacked && run->m_stacked_text != 0)
{
run_strings += L"[[";
run_strings += run->m_stacked_text->m_separator;
GetRunText(run->m_stacked_text->m_top_run, run_strings, true_bool);
run_strings += run->m_stacked_text->m_separator;
GetRunText(run->m_stacked_text->m_bottom_run, run_strings, true_bool);